| Index: chrome/browser/resources/options/language_options.js
|
| diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js
|
| index 0e85622be1123da3591cd128bf9746a7c3100865..20567892f254955d6c561ab8e73c9add065b207f 100644
|
| --- a/chrome/browser/resources/options/language_options.js
|
| +++ b/chrome/browser/resources/options/language_options.js
|
| @@ -16,10 +16,7 @@ cr.define('options', function() {
|
| * Spell check dictionary download status.
|
| * @type {Enum}
|
| */
|
| - /** @const*/ var DOWNLOAD_STATUS = {
|
| - IN_PROGRESS: 1,
|
| - FAILED: 2
|
| - };
|
| + /** @const*/ var DOWNLOAD_STATUS = {IN_PROGRESS: 1, FAILED: 2};
|
|
|
| /**
|
| * The preference is a boolean that enables/disables spell checking.
|
| @@ -82,8 +79,9 @@ cr.define('options', function() {
|
| * @extends {cr.ui.pageManager.Page}
|
| */
|
| function LanguageOptions(model) {
|
| - Page.call(this, 'languages',
|
| - loadTimeData.getString('languagePageTabTitle'), 'languagePage');
|
| + Page.call(
|
| + this, 'languages', loadTimeData.getString('languagePageTabTitle'),
|
| + 'languagePage');
|
| }
|
|
|
| cr.addSingletonGetter(LanguageOptions);
|
| @@ -172,15 +170,15 @@ cr.define('options', function() {
|
| var languageOptionsList = $('language-options-list');
|
| LanguageList.decorate(languageOptionsList);
|
|
|
| - languageOptionsList.addEventListener('change',
|
| - this.handleLanguageOptionsListChange_.bind(this));
|
| - languageOptionsList.addEventListener('save',
|
| - this.handleLanguageOptionsListSave_.bind(this));
|
| + languageOptionsList.addEventListener(
|
| + 'change', this.handleLanguageOptionsListChange_.bind(this));
|
| + languageOptionsList.addEventListener(
|
| + 'save', this.handleLanguageOptionsListSave_.bind(this));
|
|
|
| this.prospectiveUiLanguageCode_ =
|
| loadTimeData.getString('prospectiveUiLanguageCode');
|
| - this.addEventListener('visibleChange',
|
| - this.handleVisibleChange_.bind(this));
|
| + this.addEventListener(
|
| + 'visibleChange', this.handleVisibleChange_.bind(this));
|
|
|
| if (cr.isChromeOS) {
|
| this.initializeInputMethodList_();
|
| @@ -188,17 +186,18 @@ cr.define('options', function() {
|
| }
|
|
|
| var checkbox = $('offer-to-translate-in-this-language');
|
| - checkbox.addEventListener('click',
|
| - this.handleOfferToTranslateCheckboxClick_.bind(this));
|
| + checkbox.addEventListener(
|
| + 'click', this.handleOfferToTranslateCheckboxClick_.bind(this));
|
|
|
| Preferences.getInstance().addEventListener(
|
| TRANSLATE_BLOCKED_LANGUAGES_PREF,
|
| this.handleTranslateBlockedLanguagesPrefChange_.bind(this));
|
| - Preferences.getInstance().addEventListener(SPELL_CHECK_DICTIONARIES_PREF,
|
| + Preferences.getInstance().addEventListener(
|
| + SPELL_CHECK_DICTIONARIES_PREF,
|
| this.handleSpellCheckDictionariesPrefChange_.bind(this));
|
| - Preferences.getInstance().addEventListener(ENABLE_TRANSLATE,
|
| - this.handleEnableTranslatePrefChange_.bind(this));
|
| - this.translateSupportedLanguages_ = /** @type {Array} */(
|
| + Preferences.getInstance().addEventListener(
|
| + ENABLE_TRANSLATE, this.handleEnableTranslatePrefChange_.bind(this));
|
| + this.translateSupportedLanguages_ = /** @type {Array} */ (
|
| loadTimeData.getValue('translateSupportedLanguages'));
|
|
|
| // Set up add button.
|
| @@ -212,8 +211,8 @@ cr.define('options', function() {
|
| this.addBlockedLanguage_(addLanguageCode);
|
| } else {
|
| PageManager.showPageByName('addLanguage');
|
| - chrome.send('coreOptionsUserMetricsAction',
|
| - ['Options_Languages_Add']);
|
| + chrome.send(
|
| + 'coreOptionsUserMetricsAction', ['Options_Languages_Add']);
|
| }
|
| };
|
| $('language-options-add-button').onclick = onclick.bind(this);
|
| @@ -224,14 +223,15 @@ cr.define('options', function() {
|
| PageManager.showPageByName('editDictionary');
|
| };
|
| $('dictionary-download-retry-button').onclick = function(e) {
|
| - chrome.send('retryDictionaryDownload',
|
| - [e.currentTarget.languageCode]);
|
| + chrome.send(
|
| + 'retryDictionaryDownload', [e.currentTarget.languageCode]);
|
| };
|
| }
|
|
|
| // Listen to add language dialog ok button.
|
| - $('add-language-overlay-ok-button').addEventListener(
|
| - 'click', this.handleAddLanguageOkButtonClick_.bind(this));
|
| + $('add-language-overlay-ok-button')
|
| + .addEventListener(
|
| + 'click', this.handleAddLanguageOkButtonClick_.bind(this));
|
|
|
| if (!(cr.isMac || cr.isChromeOS)) {
|
| // Handle spell check enable/disable.
|
| @@ -241,9 +241,10 @@ cr.define('options', function() {
|
|
|
| // Handle clicks on "Use this language for spell checking" button.
|
| if (!cr.isMac) {
|
| - $('spellcheck-language-checkbox').addEventListener(
|
| - 'change',
|
| - this.handleSpellCheckLanguageCheckboxClick_.bind(this));
|
| + $('spellcheck-language-checkbox')
|
| + .addEventListener(
|
| + 'change',
|
| + this.handleSpellCheckLanguageCheckboxClick_.bind(this));
|
| }
|
|
|
| if (cr.isChromeOS) {
|
| @@ -271,8 +272,8 @@ cr.define('options', function() {
|
|
|
| // Listen to check on 'activate-ime-menu' checkbox.
|
| var checkboxImeMenu = $('activate-ime-menu');
|
| - checkboxImeMenu.addEventListener('click',
|
| - this.handleActivateImeMenuCheckboxClick_.bind(this));
|
| + checkboxImeMenu.addEventListener(
|
| + 'click', this.handleActivateImeMenuCheckboxClick_.bind(this));
|
| }
|
| },
|
|
|
| @@ -287,12 +288,12 @@ cr.define('options', function() {
|
| // change the visibility in handleLanguageOptionsListChange_() based
|
| // on the selected language. Note that we only have less than 100
|
| // input methods, so creating DOM nodes at once here should be ok.
|
| - this.appendInputMethodElement_(/** @type {!Array} */(
|
| - loadTimeData.getValue('inputMethodList')));
|
| - this.appendComponentExtensionIme_(/** @type {!Array} */(
|
| + this.appendInputMethodElement_(
|
| + /** @type {!Array} */ (loadTimeData.getValue('inputMethodList')));
|
| + this.appendComponentExtensionIme_(/** @type {!Array} */ (
|
| loadTimeData.getValue('componentExtensionImeList')));
|
| - this.appendInputMethodElement_(/** @type {!Array} */(
|
| - loadTimeData.getValue('extensionImeList')));
|
| + this.appendInputMethodElement_(
|
| + /** @type {!Array} */ (loadTimeData.getValue('extensionImeList')));
|
|
|
| // Listen to pref change once the input method list is initialized.
|
| Preferences.getInstance().addEventListener(
|
| @@ -358,8 +359,7 @@ cr.define('options', function() {
|
| }
|
|
|
| // Listen to user clicks.
|
| - input.addEventListener('click',
|
| - this.handleCheckboxClick_.bind(this));
|
| + input.addEventListener('click', this.handleCheckboxClick_.bind(this));
|
| inputMethodList.appendChild(element);
|
| }
|
| },
|
| @@ -375,8 +375,9 @@ cr.define('options', function() {
|
| langCode = this.convertLangCodeForTranslation_(langCode);
|
| if (this.translateBlockedLanguages_.indexOf(langCode) == -1) {
|
| this.translateBlockedLanguages_.push(langCode);
|
| - Preferences.setListPref(TRANSLATE_BLOCKED_LANGUAGES_PREF,
|
| - this.translateBlockedLanguages_, true);
|
| + Preferences.setListPref(
|
| + TRANSLATE_BLOCKED_LANGUAGES_PREF, this.translateBlockedLanguages_,
|
| + true);
|
| }
|
| },
|
|
|
| @@ -391,12 +392,13 @@ cr.define('options', function() {
|
| langCode = this.convertLangCodeForTranslation_(langCode);
|
| if (this.translateBlockedLanguages_.indexOf(langCode) != -1) {
|
| this.translateBlockedLanguages_ =
|
| - this.translateBlockedLanguages_.filter(
|
| - function(langCodeNotTranslated) {
|
| - return langCodeNotTranslated != langCode;
|
| - });
|
| - Preferences.setListPref(TRANSLATE_BLOCKED_LANGUAGES_PREF,
|
| - this.translateBlockedLanguages_, true);
|
| + this.translateBlockedLanguages_.filter(function(
|
| + langCodeNotTranslated) {
|
| + return langCodeNotTranslated != langCode;
|
| + });
|
| + Preferences.setListPref(
|
| + TRANSLATE_BLOCKED_LANGUAGES_PREF, this.translateBlockedLanguages_,
|
| + true);
|
| }
|
| },
|
|
|
| @@ -493,8 +495,8 @@ cr.define('options', function() {
|
| var newPreloadEngines = [];
|
| for (var i = 0; i < languageCodes.length; i++) {
|
| var languageCode = languageCodes[i];
|
| - var inputMethodIds = this.languageCodeToInputMethodIdsMap_[
|
| - languageCode];
|
| + var inputMethodIds =
|
| + this.languageCodeToInputMethodIdsMap_[languageCode];
|
| if (!inputMethodIds)
|
| continue;
|
|
|
| @@ -541,8 +543,8 @@ cr.define('options', function() {
|
| * @private
|
| */
|
| updateSelectedLanguageName_: function(languageCode) {
|
| - var languageInfo = LanguageList.getLanguageInfoFromLanguageCode(
|
| - languageCode);
|
| + var languageInfo =
|
| + LanguageList.getLanguageInfoFromLanguageCode(languageCode);
|
| var languageDisplayName = languageInfo.displayName;
|
| var languageNativeDisplayName = languageInfo.nativeDisplayName;
|
| var textDirection = languageInfo.textDirection;
|
| @@ -675,8 +677,8 @@ cr.define('options', function() {
|
| var areNoLanguagesSelected =
|
| Object.keys(this.spellCheckLanguages_).length == 0;
|
| var usesSystemSpellchecker = !$('enable-spellcheck-container');
|
| - var isSpellcheckingEnabled = usesSystemSpellchecker ||
|
| - $('enable-spellcheck').checked;
|
| + var isSpellcheckingEnabled =
|
| + usesSystemSpellchecker || $('enable-spellcheck').checked;
|
| $('edit-custom-dictionary-button').hidden =
|
| areNoLanguagesSelected || !isSpellcheckingEnabled;
|
| },
|
| @@ -859,8 +861,8 @@ cr.define('options', function() {
|
| // Third party IMEs require additional confirmation prior to enabling due
|
| // to privacy risk.
|
| if (/^_ext_ime_/.test(checkbox.inputMethodId) && checkbox.checked) {
|
| - var confirmationCallback = this.handleCheckboxUpdate_.bind(this,
|
| - checkbox);
|
| + var confirmationCallback =
|
| + this.handleCheckboxUpdate_.bind(this, checkbox);
|
| var cancellationCallback = function() {
|
| checkbox.checked = false;
|
| };
|
| @@ -873,9 +875,10 @@ cr.define('options', function() {
|
| this.handleCheckboxUpdate_(checkbox);
|
| }
|
|
|
| - chrome.send('coreOptionsUserMetricsAction',
|
| - ['Options_Languages_InputMethodCheckbox' +
|
| - (checkbox.checked ? '_Enable' : '_Disable')]);
|
| + chrome.send(
|
| + 'coreOptionsUserMetricsAction',
|
| + ['Options_Languages_InputMethodCheckbox' +
|
| + (checkbox.checked ? '_Enable' : '_Disable')]);
|
| },
|
|
|
| /**
|
| @@ -933,8 +936,7 @@ cr.define('options', function() {
|
| // Don't allow removing the language if it's a UI language.
|
| if (languageCode == this.prospectiveUiLanguageCode_)
|
| return false;
|
| - return (!cr.isChromeOS ||
|
| - this.canDeleteLanguage_(languageCode));
|
| + return (!cr.isChromeOS || this.canDeleteLanguage_(languageCode));
|
| },
|
|
|
| /**
|
| @@ -1009,13 +1011,13 @@ cr.define('options', function() {
|
| delete this.spellCheckLanguages_[languageCode];
|
|
|
| var languageCodes = Object.keys(this.spellCheckLanguages_);
|
| - Preferences.setListPref(SPELL_CHECK_DICTIONARIES_PREF,
|
| - languageCodes, true);
|
| + Preferences.setListPref(
|
| + SPELL_CHECK_DICTIONARIES_PREF, languageCodes, true);
|
|
|
| // The spellCheckLanguageChange argument is only used for logging.
|
| chrome.send('spellCheckLanguageChange', [languageCodes.join(',')]);
|
| - chrome.send('coreOptionsUserMetricsAction',
|
| - ['Options_Languages_SpellCheck']);
|
| + chrome.send(
|
| + 'coreOptionsUserMetricsAction', ['Options_Languages_SpellCheck']);
|
| },
|
|
|
| /**
|
| @@ -1082,8 +1084,9 @@ cr.define('options', function() {
|
| * @private
|
| */
|
| saveEnabledExtensionPref_: function() {
|
| - Preferences.setStringPref(ENABLED_EXTENSION_IME_PREF,
|
| - this.enabledExtensionImes_.join(','), true);
|
| + Preferences.setStringPref(
|
| + ENABLED_EXTENSION_IME_PREF, this.enabledExtensionImes_.join(','),
|
| + true);
|
| },
|
|
|
| /**
|
| @@ -1134,8 +1137,8 @@ cr.define('options', function() {
|
| * @private
|
| */
|
| savePreloadEnginesPref_: function() {
|
| - Preferences.setStringPref(PRELOAD_ENGINES_PREF,
|
| - this.preloadEngines_.join(','), true);
|
| + Preferences.setStringPref(
|
| + PRELOAD_ENGINES_PREF, this.preloadEngines_.join(','), true);
|
| },
|
|
|
| /**
|
| @@ -1300,9 +1303,12 @@ cr.define('options', function() {
|
|
|
| // Otherwise, show a notification telling the user that their changes will
|
| // only take effect after restart.
|
| - showMutuallyExclusiveNodes([$('language-options-ui-language-button'),
|
| - $('language-options-ui-notification-bar')],
|
| - 1);
|
| + showMutuallyExclusiveNodes(
|
| + [
|
| + $('language-options-ui-language-button'),
|
| + $('language-options-ui-notification-bar')
|
| + ],
|
| + 1);
|
| },
|
|
|
| /**
|
| @@ -1395,8 +1401,8 @@ cr.define('options', function() {
|
| handleActivateImeMenuCheckboxClick_: function(e) {
|
| if (cr.isChromeOS) {
|
| var checkbox = e.target;
|
| - Preferences.setBooleanPref(ACTIVATE_IME_MENU_PREF,
|
| - checkbox.checked, true);
|
| + Preferences.setBooleanPref(
|
| + ACTIVATE_IME_MENU_PREF, checkbox.checked, true);
|
| }
|
| },
|
|
|
| @@ -1440,7 +1446,5 @@ cr.define('options', function() {
|
| };
|
|
|
| // Export
|
| - return {
|
| - LanguageOptions: LanguageOptions
|
| - };
|
| + return {LanguageOptions: LanguageOptions};
|
| });
|
|
|