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

18
resources/js/ext.uls.inputsettings.js
View File

@@ -54,7 +54,7 @@
'<div class="row">' +
'<div class="twelve columns uls-input-settings-disable-info"></div>' +
'<div class="ten columns uls-input-settings-toggle">' +
'<button class="cdx-button cdx-button--action-progressive active uls-input-toggle-button"></button>' +
'<button class="mw-ui-button mw-ui-progressive active uls-input-toggle-button"></button>' +
'</div>' +
'</div>';
@@ -169,11 +169,10 @@
return $();
}
$imeLabel = $( '<label>' ).attr( 'for', imeId ).addClass( 'cdx-radio__label' );
$imeLabel = $( '<label>' ).attr( 'for', imeId );
$inputMethodItem = $( '<input>' ).attr( {
type: 'radio',
class: 'cdx-radio__input',
name: 'ime',
id: imeId,
value: imeId
@@ -212,10 +211,9 @@
$helplink
);
var $icon = $( '<span>' ).addClass( 'cdx-radio__icon' );
return $( '<div>' )
.addClass( 'cdx-radio' )
.append( $inputMethodItem, $icon, $imeLabel );
.addClass( 'mw-ui-radio' )
.append( $inputMethodItem, $imeLabel );
},
/**
@@ -280,8 +278,8 @@
$.ime.preferences.setLanguage( selectedLang );
}
// Mark the button selected
$( '.uls-ui-languages .cdx-button' ).removeClass( 'uls-cdx-button-pressed' );
button.addClass( 'uls-cdx-button-pressed' );
$( '.uls-ui-languages .mw-ui-button' ).removeClass( 'mw-ui-pressed' );
button.addClass( 'mw-ui-pressed' );
inputSettings.prepareInputmethods( selectedLang );
};
}
@@ -292,7 +290,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,
@@ -324,7 +322,7 @@
$languages = this.$template.find( '.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 ime settings