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

Merge "Input settings - language selection cleanup"

Browse Source
This commit is contained in:
jenkins-bot
2013-06-13 10:09:31 +00:00
committed by Gerrit Code Review
parent f0eca06c1c 638ab5bb3d
commit dce0b387c7
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@
this.name = $.i18n( 'ext-uls-input-settings-title-short' ); this.name = $.i18n( 'ext-uls-input-settings-title-short' );
this.description = $.i18n( 'ext-uls-input-settings-desc' ); this.description = $.i18n( 'ext-uls-input-settings-desc' );
this.$template = $( template ); this.$template = $( template );
this.imeLanguage = this.getInterfaceLanguage(); this.uiLanguage = this.getInterfaceLanguage();
this.contentLanguage = this.getContentLanguage(); this.contentLanguage = this.getContentLanguage();
this.$imes = null; this.$imes = null;
this.$parent = $parent; this.$parent = $parent;
@@ -125,7 +125,6 @@
$imeListTitle; $imeListTitle;
imes = $.ime.languages[language]; imes = $.ime.languages[language];
this.imeLanguage = language;
$imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' ); $imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' );
$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' ); $imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
@@ -150,10 +149,8 @@
for ( index in imes.inputmethods ) { for ( index in imes.inputmethods ) {
imeId = imes.inputmethods[index]; imeId = imes.inputmethods[index];
selected = defaultInputmethod === imeId; selected = defaultInputmethod === imeId;
//$.ime.load( imeId, function () {
$imeListContainer.append( inputSettings.renderInputmethodOption( imeId, $imeListContainer.append( inputSettings.renderInputmethodOption( imeId,
selected ) ); selected ) );
//} );
} }
$imeListContainer.append( inputSettings.renderInputmethodOption( 'system', $imeListContainer.append( inputSettings.renderInputmethodOption( 'system',
@@ -237,11 +234,10 @@
} }
// UI language must always be present // UI language must always be present
if ( this.imeLanguage !== this.contentLanguage && if ( this.uiLanguage !== this.contentLanguage &&
$.uls.data.languages[this.imeLanguage] && $.uls.data.languages[this.uiLanguage] &&
$.inArray( this.imeLanguage, languagesForButtons ) === -1 ) { $.inArray( this.uiLanguage, languagesForButtons ) === -1 ) {
languagesForButtons.push( this.imeLanguage ); languagesForButtons.push( this.uiLanguage );
selectedImeLanguage = this.imeLanguage;
} }
for ( lang in suggestedLanguages ) { for ( lang in suggestedLanguages ) {
@@ -260,16 +256,14 @@
function buttonHandler( button ) { function buttonHandler( button ) {
return function () { return function () {
var selectedLanguage = button.data( 'language' ) || inputSettings.imeLanguage; var language = button.data( 'language' );
if ( selectedLanguage !== inputSettings.imeLanguage ) {
inputSettings.enableApplyButton(); inputSettings.enableApplyButton();
} $.ime.preferences.setLanguage( language );
// Mark the button selected
$.ime.preferences.setLanguage( selectedLanguage );
$( '.uls-ui-languages .button' ).removeClass( 'down' ); $( '.uls-ui-languages .button' ).removeClass( 'down' );
button.addClass( 'down' ); button.addClass( 'down' );
inputSettings.prepareInputmethods( selectedLanguage ); inputSettings.prepareInputmethods( language );
}; };
} }
@@ -361,7 +355,7 @@
}, },
onSelect: function ( langCode ) { onSelect: function ( langCode ) {
inputSettings.enableApplyButton(); inputSettings.enableApplyButton();
inputSettings.imeLanguage = langCode; $.ime.preferences.setLanguage( langCode );
inputSettings.$parent.show(); inputSettings.$parent.show();
inputSettings.prepareLanguages(); inputSettings.prepareLanguages();
}, },
@@ -452,7 +446,6 @@
$imeListContainer.on( 'change', 'input:radio[name=ime]:checked', function () { $imeListContainer.on( 'change', 'input:radio[name=ime]:checked', function () {
inputSettings.enableApplyButton(); inputSettings.enableApplyButton();
$.ime.preferences.setLanguage( inputSettings.imeLanguage );
$.ime.preferences.setIM( $( this ).val() ); $.ime.preferences.setIM( $( this ).val() );
} ); } );