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

Merge "Avoid null in the IME languages buttons"

Browse Source
This commit is contained in:
jenkins-bot
2013-04-29 12:20:09 +00:00
committed by Gerrit Code Review
parent 16e7b63e41 3471158dec
commit 9bb7255467
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,9 +201,10 @@
prepareLanguages: function () { prepareLanguages: function () {
var inputSettings = this, var inputSettings = this,
SUGGESTED_LANGUAGES_NUMBER = 3, SUGGESTED_LANGUAGES_NUMBER = 3,
firstLanguage = this.contentLanguage,
selectedImeLanguage = $.ime.preferences.getLanguage(), selectedImeLanguage = $.ime.preferences.getLanguage(),
languagesForButtons, $languages, suggestedLanguages, languagesForButtons, $languages, suggestedLanguages,
firstLanguage, lang, i, language, $button, $caret; lang, i, language, $button, $caret;
$languages = this.$template.find( 'div.uls-ui-languages' ); $languages = this.$template.find( 'div.uls-ui-languages' );
this.$template.find( 'div.uls-ui-languages' ).show(); this.$template.find( 'div.uls-ui-languages' ).show();
@@ -223,14 +224,18 @@
$languages.empty(); $languages.empty();
// UI language must always be present // UI language must always be present
if ( this.imeLanguage !== this.contentLanguage ) { if ( this.imeLanguage !== this.contentLanguage &&
$.uls.data.languages[this.imeLanguage]
) {
languagesForButtons.push( this.imeLanguage ); languagesForButtons.push( this.imeLanguage );
firstLanguage = this.imeLanguage; firstLanguage = this.imeLanguage;
} }
// Selected IME language may be different, and it must // Selected IME language may be different, and it must
// be present, too // be present, too
if ( $.inArray( selectedImeLanguage, languagesForButtons ) === -1 ) { if ( $.inArray( selectedImeLanguage, languagesForButtons ) === -1 &&
$.uls.data.languages[selectedImeLanguage]
) {
languagesForButtons.push( selectedImeLanguage ); languagesForButtons.push( selectedImeLanguage );
firstLanguage = selectedImeLanguage; firstLanguage = selectedImeLanguage;
} }