Consistent name for the inputSettings variable
Rename various names of "that = this" to "inputSettings = this". Change-Id: If547a1e8da102c755019b50a5bc35f9c2cc4ab6a
This commit is contained in:
@@ -106,8 +106,9 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
prepareInputmethods: function ( language ) {
|
prepareInputmethods: function ( language ) {
|
||||||
var inputsettings, $imeListContainer, defaultInputmethod, imes, selected, imeId,
|
var index = 0,
|
||||||
index = 0, $imeListTitle;
|
inputSettings, $imeListContainer, defaultInputmethod, imes, selected, imeId,
|
||||||
|
$imeListTitle;
|
||||||
|
|
||||||
imes = $.ime.languages[language];
|
imes = $.ime.languages[language];
|
||||||
this.imeLanguage = language;
|
this.imeLanguage = language;
|
||||||
@@ -123,7 +124,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
inputsettings = this;
|
inputSettings = this;
|
||||||
|
|
||||||
$imeListTitle.text( $.i18n( 'ext-uls-input-settings-ime-settings',
|
$imeListTitle.text( $.i18n( 'ext-uls-input-settings-ime-settings',
|
||||||
$.uls.data.getAutonym( language ) ) );
|
$.uls.data.getAutonym( language ) ) );
|
||||||
@@ -134,12 +135,12 @@
|
|||||||
imeId = imes.inputmethods[index];
|
imeId = imes.inputmethods[index];
|
||||||
selected = defaultInputmethod === imeId;
|
selected = defaultInputmethod === imeId;
|
||||||
//$.ime.load( imeId, function () {
|
//$.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',
|
||||||
defaultInputmethod === 'system' ) );
|
defaultInputmethod === 'system' ) );
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -185,11 +186,11 @@
|
|||||||
* Prepare the UI language selector
|
* Prepare the UI language selector
|
||||||
*/
|
*/
|
||||||
prepareLanguages: function () {
|
prepareLanguages: function () {
|
||||||
var imeSettings = this, languagesForButtons, $languages, suggestedLanguages,
|
var inputSettings = this,
|
||||||
|
languagesForButtons, $languages, suggestedLanguages,
|
||||||
SUGGESTED_LANGUAGES_NUMBER, lang, i, language, $button;
|
SUGGESTED_LANGUAGES_NUMBER, lang, i, language, $button;
|
||||||
|
|
||||||
SUGGESTED_LANGUAGES_NUMBER = 3;
|
SUGGESTED_LANGUAGES_NUMBER = 3;
|
||||||
imeSettings = this;
|
|
||||||
$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();
|
||||||
this.$template.find( 'div.uls-input-settings-languages-title' ).show();
|
this.$template.find( 'div.uls-input-settings-languages-title' ).show();
|
||||||
@@ -227,12 +228,12 @@
|
|||||||
|
|
||||||
function buttonHandler( button ) {
|
function buttonHandler( button ) {
|
||||||
return function () {
|
return function () {
|
||||||
var selectedLanguage = button.data( 'language' ) || imeSettings.imeLanguage;
|
var selectedLanguage = button.data( 'language' ) || inputSettings.imeLanguage;
|
||||||
|
|
||||||
$.ime.preferences.setLanguage( selectedLanguage );
|
$.ime.preferences.setLanguage( selectedLanguage );
|
||||||
$( 'div.uls-ui-languages button.button' ).removeClass( 'down' );
|
$( 'div.uls-ui-languages button.button' ).removeClass( 'down' );
|
||||||
button.addClass( 'down' );
|
button.addClass( 'down' );
|
||||||
imeSettings.prepareInputmethods( selectedLanguage );
|
inputSettings.prepareInputmethods( selectedLanguage );
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -263,9 +264,9 @@
|
|||||||
* Prepare the more languages button. It is a ULS trigger
|
* Prepare the more languages button. It is a ULS trigger
|
||||||
*/
|
*/
|
||||||
prepareMoreLanguages: function () {
|
prepareMoreLanguages: function () {
|
||||||
var that, $languages, $moreLanguagesButton;
|
var inputSettings = this,
|
||||||
|
$languages, $moreLanguagesButton;
|
||||||
|
|
||||||
that = this;
|
|
||||||
$languages = this.$template.find( 'div.uls-ui-languages' );
|
$languages = this.$template.find( 'div.uls-ui-languages' );
|
||||||
$moreLanguagesButton = $( '<button>' )
|
$moreLanguagesButton = $( '<button>' )
|
||||||
.prop( 'id', 'uls-more-languages' )
|
.prop( 'id', 'uls-more-languages' )
|
||||||
@@ -274,8 +275,8 @@
|
|||||||
$languages.append( $moreLanguagesButton );
|
$languages.append( $moreLanguagesButton );
|
||||||
// Show the long language list to select a language for ime settings
|
// Show the long language list to select a language for ime settings
|
||||||
$moreLanguagesButton.uls( {
|
$moreLanguagesButton.uls( {
|
||||||
left: that.$parent.left,
|
left: inputSettings.$parent.left,
|
||||||
top: that.$parent.top,
|
top: inputSettings.$parent.top,
|
||||||
onReady: function () {
|
onReady: function () {
|
||||||
var uls = this,
|
var uls = this,
|
||||||
$back = $( '<a>' )
|
$back = $( '<a>' )
|
||||||
@@ -283,35 +284,35 @@
|
|||||||
|
|
||||||
$back.click( function () {
|
$back.click( function () {
|
||||||
uls.hide();
|
uls.hide();
|
||||||
that.$parent.show();
|
inputSettings.$parent.show();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
uls.$menu.find( 'div.uls-title' ).append( $back );
|
uls.$menu.find( 'div.uls-title' ).append( $back );
|
||||||
},
|
},
|
||||||
onSelect: function ( langCode ) {
|
onSelect: function ( langCode ) {
|
||||||
that.imeLanguage = langCode;
|
inputSettings.imeLanguage = langCode;
|
||||||
that.$parent.show();
|
inputSettings.$parent.show();
|
||||||
that.prepareLanguages();
|
inputSettings.prepareLanguages();
|
||||||
that.prepareInputmethods( langCode );
|
inputSettings.prepareInputmethods( langCode );
|
||||||
},
|
},
|
||||||
languages: mw.ime.getLanguagesWithIME(),
|
languages: mw.ime.getLanguagesWithIME(),
|
||||||
lazyload: false
|
lazyload: false
|
||||||
} );
|
} );
|
||||||
|
|
||||||
$moreLanguagesButton.on( 'click', function () {
|
$moreLanguagesButton.on( 'click', function () {
|
||||||
that.$parent.hide();
|
inputSettings.$parent.hide();
|
||||||
} );
|
} );
|
||||||
},
|
},
|
||||||
|
|
||||||
prepareToggleButton: function () {
|
prepareToggleButton: function () {
|
||||||
var inputsettings, $toggleButton, $toggleButtonDesc;
|
var inputSettings, $toggleButton, $toggleButtonDesc;
|
||||||
|
|
||||||
inputsettings = this;
|
inputSettings = this;
|
||||||
|
|
||||||
$toggleButton = inputsettings.$template
|
$toggleButton = inputSettings.$template
|
||||||
.find( 'button.uls-input-toggle-button' );
|
.find( 'button.uls-input-toggle-button' );
|
||||||
|
|
||||||
$toggleButtonDesc = inputsettings.$template
|
$toggleButtonDesc = inputSettings.$template
|
||||||
.find( 'div.uls-input-settings-disable-info' );
|
.find( 'div.uls-input-settings-disable-info' );
|
||||||
|
|
||||||
if ( $.ime.preferences.isEnabled() ) {
|
if ( $.ime.preferences.isEnabled() ) {
|
||||||
@@ -355,7 +356,8 @@
|
|||||||
* Register general event listeners
|
* Register general event listeners
|
||||||
*/
|
*/
|
||||||
listen: function () {
|
listen: function () {
|
||||||
var inputSettings = this, $imeListContainer;
|
var inputSettings = this,
|
||||||
|
$imeListContainer;
|
||||||
|
|
||||||
$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
|
$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
|
||||||
|
|
||||||
@@ -446,12 +448,12 @@
|
|||||||
* Handle the apply button press
|
* Handle the apply button press
|
||||||
*/
|
*/
|
||||||
apply: function () {
|
apply: function () {
|
||||||
var that = this;
|
var inputSettings = this;
|
||||||
|
|
||||||
// Save the preferences
|
// Save the preferences
|
||||||
$.ime.preferences.save( function ( result ) {
|
$.ime.preferences.save( function ( result ) {
|
||||||
// closure for not losing the scope
|
// closure for not losing the scope
|
||||||
that.onSave( result );
|
inputSettings.onSave( result );
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user