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

Revert "Update inputs to use mw-ui styles"

Browse Source 
This reverts commit 30d26a4fd2.

Some issues in this patch were identified, see T52599.

Reverting so that MLEB can be released and issues fixed and
tested properly after the release.

Change-Id: I35c1eb2db5ead8ca75dc2724997d789c83c69b6d
This commit is contained in:
Santhosh Thottingal
2015-03-30 10:37:26 +05:30
committed by Nikerabbit
parent 2b05d0fe70
commit 91eff55c8c
5 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,9 +48,9 @@
// Disable IME system button
+ '<div class="row">'
+ '<div class="eleven columns uls-input-settings-disable-info"></div>'
+ '<div class="six columns uls-input-settings-toggle">'
+ '<button class="mw-ui-button uls-input-toggle-button"></button>'
+ '<div class="eleven columns button uls-input-settings-disable-info"></div>'
+ '<div class="six columns button uls-input-settings-toggle">'
+ '<button class="active green button uls-input-toggle-button"></button>'
+ '</div>'
+ '</div>';
@@ -119,7 +119,7 @@
$imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' );
$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
$imeListContainer.find( 'div, label' ).remove();
$imeListContainer.find( 'label' ).remove();
if ( !imes ) {
$imeListContainer.append( $( '<label>' )
@@ -159,7 +159,7 @@
* @return {Object} jQuery object corresponding to the input method item.
*/
renderInputmethodOption: function ( imeId, selected ) {
var $imeHolder, $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem;
var $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem;
if ( imeId !== 'system' && !$.ime.sources[imeId] ) {
// imeId not known for jquery.ime.
@@ -167,8 +167,6 @@
return $();
}
$imeHolder = $( '<div>' ).addClass( 'mw-ui-radio' );
$imeLabel = $( '<label>' ).attr( {
'for': imeId,
'class': 'imelabel'
@@ -181,7 +179,7 @@
checked: selected
} );
$imeHolder.append( $inputMethodItem );
$imeLabel.append( $inputMethodItem );
if ( imeId === 'system' ) {
name = $.i18n( 'ext-uls-disable-input-method' );
@@ -211,8 +209,7 @@
$helplink
);
$imeHolder.append( $imeLabel );
return $imeHolder;
return $imeLabel;
},
/**
@@ -277,8 +274,8 @@
$.ime.preferences.setLanguage( language );
}
// Mark the button selected
$( '.uls-ui-languages .mw-ui-button' ).removeClass( 'mw-ui-checked' );
button.addClass( 'mw-ui-checked' );
$( '.uls-ui-languages .button' ).removeClass( 'down' );
button.addClass( 'down' );
inputSettings.prepareInputmethods( language );
};
}
@@ -289,7 +286,7 @@
for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
language = languagesForButtons[i];
$button = $( '<button>' )
.addClass( 'mw-ui-button uls-language-button autonym' )
.addClass( 'button uls-language-button autonym' )
.text( $.uls.data.getAutonym( language ) )
.prop( {
lang: language,
@@ -321,7 +318,7 @@
$languages = this.$template.find( '.uls-ui-languages' );
$moreLanguagesButton = $( '<button>' )
.prop( 'class', 'uls-more-languages' )
.addClass( 'mw-ui-button' ).text( '...' );
.addClass( 'button' ).text( '...' );
$languages.append( $moreLanguagesButton );
// Show the long language list to select a language for ime settings