From f410f5d99af067032877ebfc011b4072767e73e2 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Thu, 22 Nov 2012 09:57:46 +0200 Subject: [PATCH] Consistent name for the inputSettings variable Rename various names of "that = this" to "inputSettings = this". Change-Id: If547a1e8da102c755019b50a5bc35f9c2cc4ab6a --- resources/js/ext.uls.inputsettings.js | 54 ++++++++++++++------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js index dabc903a..bf2ba41e 100644 --- a/resources/js/ext.uls.inputsettings.js +++ b/resources/js/ext.uls.inputsettings.js @@ -106,8 +106,9 @@ }, prepareInputmethods: function ( language ) { - var inputsettings, $imeListContainer, defaultInputmethod, imes, selected, imeId, - index = 0, $imeListTitle; + var index = 0, + inputSettings, $imeListContainer, defaultInputmethod, imes, selected, imeId, + $imeListTitle; imes = $.ime.languages[language]; this.imeLanguage = language; @@ -123,7 +124,7 @@ return; } - inputsettings = this; + inputSettings = this; $imeListTitle.text( $.i18n( 'ext-uls-input-settings-ime-settings', $.uls.data.getAutonym( language ) ) ); @@ -134,12 +135,12 @@ imeId = imes.inputmethods[index]; selected = defaultInputmethod === imeId; //$.ime.load( imeId, function () { - $imeListContainer.append( inputsettings.renderInputmethodOption( imeId, + $imeListContainer.append( inputSettings.renderInputmethodOption( imeId, selected ) ); //} ); } - $imeListContainer.append( inputsettings.renderInputmethodOption( 'system', + $imeListContainer.append( inputSettings.renderInputmethodOption( 'system', defaultInputmethod === 'system' ) ); }, @@ -185,11 +186,11 @@ * Prepare the UI language selector */ prepareLanguages: function () { - var imeSettings = this, languagesForButtons, $languages, suggestedLanguages, + var inputSettings = this, + languagesForButtons, $languages, suggestedLanguages, SUGGESTED_LANGUAGES_NUMBER, lang, i, language, $button; SUGGESTED_LANGUAGES_NUMBER = 3; - imeSettings = this; $languages = this.$template.find( 'div.uls-ui-languages' ); this.$template.find( 'div.uls-ui-languages' ).show(); this.$template.find( 'div.uls-input-settings-languages-title' ).show(); @@ -227,12 +228,12 @@ function buttonHandler( button ) { return function () { - var selectedLanguage = button.data( 'language' ) || imeSettings.imeLanguage; + var selectedLanguage = button.data( 'language' ) || inputSettings.imeLanguage; $.ime.preferences.setLanguage( selectedLanguage ); $( 'div.uls-ui-languages button.button' ).removeClass( 'down' ); button.addClass( 'down' ); - imeSettings.prepareInputmethods( selectedLanguage ); + inputSettings.prepareInputmethods( selectedLanguage ); }; } @@ -263,9 +264,9 @@ * Prepare the more languages button. It is a ULS trigger */ prepareMoreLanguages: function () { - var that, $languages, $moreLanguagesButton; + var inputSettings = this, + $languages, $moreLanguagesButton; - that = this; $languages = this.$template.find( 'div.uls-ui-languages' ); $moreLanguagesButton = $( '