bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use Codex styles for buttons in language overlay"

Browse Source 
This reverts commit d29050d080.

Reason for revert: I had mistakenly assumed the @wikimedia/codex
module was loaded on clicking the language button. It appears to
be added on page load.

Given T248718 it's still unclear what our policy on loading
@wikimedia/codex on page load is and given several people are out
I think it would be better to attempt this again next week, possibly
delaying further if needed.

Bug: T353071
Bug: T248718
Change-Id: I09334a1faec06a7400e61013ddda374156bf5d72
This commit is contained in:
Jdlrobson
2023-12-08 21:29:24 +00:00
committed by jenkins-bot
parent 7124612558
commit 5481573341
11 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
resources/js/ext.uls.displaysettings.js
View File

@@ -25,10 +25,10 @@
// Tab switcher buttons
'<div class="row">' +
'<div class="twelve columns uls-display-settings-tab-switcher">' +
'<div class="uls-button-group cdx-button-group">' +
'<button id="uls-display-settings-language-tab" class="cdx-button uls-cdx-button-pressed" ' +
'<div class="uls-button-group mw-ui-button-group">' +
'<button id="uls-display-settings-language-tab" class="mw-ui-button mw-ui-pressed" ' +
'data-i18n="ext-uls-display-settings-language-tab"></button>' +
'<button id="uls-display-settings-fonts-tab" class="cdx-button" data-i18n="ext-uls-display-settings-fonts-tab"></button>' +
'<button id="uls-display-settings-fonts-tab" class="mw-ui-button" data-i18n="ext-uls-display-settings-fonts-tab"></button>' +
'</div>' +
'</div>' +
'</div>' +
@@ -87,10 +87,9 @@
// Webfonts enabling checkbox with label
'<div class="row">' +
'<div class="twelve columns">' +
'<div class="cdx-checkbox">' +
'<input type="checkbox" id="webfonts-enable-checkbox" class="cdx-checkbox__input" />' +
'<span class="cdx-checkbox__icon"></span>' +
'<label class="checkbox cdx-checkbox__label" for="webfonts-enable-checkbox" >' +
'<div class="mw-ui-checkbox">' +
'<input type="checkbox" id="webfonts-enable-checkbox" />' +
'<label class="checkbox" for="webfonts-enable-checkbox" >' +
'<strong data-i18n="ext-uls-webfonts-settings-title"></strong> ' +
'<span data-i18n="ext-uls-webfonts-settings-info"></span> ' +
'<a target="_blank" href="https://www.mediawiki.org/wiki/Universal_Language_Selector/WebFonts" data-i18n="ext-uls-webfonts-settings-info-link"></a>' +
@@ -259,8 +258,8 @@
return function () {
displaySettings.markDirty();
displaySettings.uiLanguage = button.data( 'language' ) || displaySettings.uiLanguage;
$( 'div.uls-ui-languages button.cdx-button' ).removeClass( 'uls-cdx-button-pressed' );
button.addClass( 'uls-cdx-button-pressed' );
$( 'div.uls-ui-languages button.mw-ui-button' ).removeClass( 'mw-ui-pressed' );
button.addClass( 'mw-ui-pressed' );
displaySettings.prepareUIFonts();
displaySettings.preview( displaySettings.uiLanguage );
};
@@ -270,7 +269,7 @@
for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
language = languagesForButtons[ i ];
$button = $( '<button>' )
.addClass( 'cdx-button uls-language-button autonym' )
.addClass( 'mw-ui-button uls-language-button autonym' )
.text( $.uls.data.getAutonym( language ) )
.prop( {
lang: language,
@@ -278,7 +277,7 @@
} );
if ( language === this.uiLanguage ) {
$button.addClass( 'uls-cdx-button-pressed' );
$button.addClass( 'mw-ui-pressed' );
}
$button.data( 'language', language );
@@ -299,7 +298,7 @@
$languages = this.$template.find( 'div.uls-ui-languages' );
$moreLanguagesButton = $( '<button>' )
.prop( 'class', 'uls-more-languages' )
.addClass( 'cdx-button' ).text( '...' );
.addClass( 'mw-ui-button' ).text( '...' );
$languages.append( $moreLanguagesButton );
// Show the long language list to select a language for display settings
@@ -589,7 +588,7 @@
var $button = $( this );
// eslint-disable-next-line no-jquery/no-class-state
if ( $button.hasClass( 'uls-cdx-button-pressed' ) ) {
if ( $button.hasClass( 'mw-ui-pressed' ) ) {
return;
}
@@ -605,8 +604,8 @@
} );
displaySettings.$parent.position();
$tabButtons.removeClass( 'uls-cdx-button-pressed' );
$button.addClass( 'uls-cdx-button-pressed' );
$tabButtons.removeClass( 'mw-ui-pressed' );
$button.addClass( 'mw-ui-pressed' );
} ).on( 'mousedown', function ( event ) {
// Avoid taking focus, to avoid bad looking focus styles
event.preventDefault();