Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chrome/browser/resources/options/language_options.js

Issue 6296017: dom-ui settings: enable languages & spell checker settings for all platforms.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: code review tweak Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/options/language_options.html ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/language_options.js
===================================================================
--- chrome/browser/resources/options/language_options.js (revision 71884)
+++ chrome/browser/resources/options/language_options.js (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -58,8 +58,12 @@
this.addEventListener('visibleChange',
this.handleVisibleChange_.bind(this));
- this.initializeInputMethodList_();
- this.initializeLanguageCodeToInputMehotdIdsMap_();
+ if (cr.isChromeOS) {
+ this.initializeInputMethodList_();
+ this.initializeLanguageCodeToInputMehotdIdsMap_();
+ }
+ Preferences.getInstance().addEventListener(this.spellCheckDictionaryPref,
+ this.handleSpellCheckDictionaryPrefChange_.bind(this));
// Set up add button.
$('language-options-add-button').onclick = function(e) {
@@ -80,10 +84,22 @@
// Setup add language overlay page.
OptionsPage.registerOverlay(AddLanguageOverlay.getInstance());
- // Listen to user clicks on the add language list.
- var addLanguageList = $('add-language-overlay-language-list');
- addLanguageList.addEventListener('click',
- this.handleAddLanguageListClick_.bind(this));
+ if (cr.isChromeOS) {
+ // Listen to user clicks on the add language list.
+ var addLanguageList = $('add-language-overlay-language-list');
+ addLanguageList.addEventListener('click',
+ this.handleAddLanguageListClick_.bind(this));
+ } else {
+ // Listen to add language dialog ok button.
+ var addLanguageOkButton = $('add-language-overlay-ok-button');
+ addLanguageOkButton.addEventListener('click',
+ this.handleAddLanguageOkButtonClick_.bind(this));
+
+ // Show experimental features if enabled.
+ if (templateData.experimentalSpellCheckFeatures == 'true') {
+ $('auto-spell-correction-option').classList.remove('hidden');
+ }
+ }
},
// The preference is a CSV string that describes preload engines
@@ -137,8 +153,6 @@
// Listen to pref change once the input method list is initialized.
Preferences.getInstance().addEventListener(this.preloadEnginesPref,
this.handlePreloadEnginesPrefChange_.bind(this));
- Preferences.getInstance().addEventListener(this.spellCheckDictionaryPref,
- this.handleSpellCheckDictionaryPrefChange_.bind(this));
},
/**
@@ -191,9 +205,11 @@
}
}
this.updateSelectedLanguageName_(languageCode);
- this.updateUiLanguageButton_(languageCode);
+ if (!cr.isMac)
+ this.updateUiLanguageButton_(languageCode);
this.updateSpellCheckLanguageButton_(languageCode);
- this.updateInputMethodList_(languageCode);
+ if (cr.isChromeOS)
+ this.updateInputMethodList_(languageCode);
this.updateLanguageListInAddLanguageOverlay_();
},
@@ -203,9 +219,11 @@
* @private
*/
handleLanguageOptionsListSave_: function(e) {
- // Sort the preload engines per the saved languages before save.
- this.preloadEngines_ = this.sortPreloadEngines_(this.preloadEngines_);
- this.savePreloadEnginesPref_();
+ if (cr.isChromeOS) {
+ // Sort the preload engines per the saved languages before save.
+ this.preloadEngines_ = this.sortPreloadEngines_(this.preloadEngines_);
+ this.savePreloadEnginesPref_();
+ }
},
/**
@@ -321,8 +339,8 @@
uiLanguageButton.onclick = function(e) {
chrome.send('uiLanguageChange', [languageCode]);
}
- $('language-options-ui-sign-out-button').onclick = function(e) {
- chrome.send('uiLanguageSignOut');
+ $('language-options-ui-restart-button').onclick = function(e) {
+ chrome.send('uiLanguageRestart');
}
} else {
// If the language is not supported as UI language, the button
@@ -507,6 +525,19 @@
},
/**
+ * Handles add language dialog ok button.
+ */
+ handleAddLanguageOkButtonClick_ : function() {
+ var languagesSelect = $('add-language-overlay-language-list');
+ var selectedIndex = languagesSelect.selectedIndex;
+ if (selectedIndex >= 0) {
+ var selection = languagesSelect.options[selectedIndex];
+ $('language-options-list').addLanguage(String(selection.value));
+ OptionsPage.clearOverlays();
+ }
+ },
+
+ /**
* Handles remove button's click event.
* @param {Event} e Click event.
*/
@@ -520,14 +551,16 @@
localStrings.getString('ok_button'));
return;
}
- // Disable input methods associated with |languageCode|.
- // Don't allow removing the language if cerntain conditions are met.
- // See removePreloadEnginesByLanguageCode_() for details.
- if (!this.removePreloadEnginesByLanguageCode_(languageCode)) {
- this.showNotification_(
- localStrings.getString('please_add_another_language'),
- localStrings.getString('ok_button'));
- return;
+ if (cr.isChromeOS) {
+ // Disable input methods associated with |languageCode|.
+ // Don't allow removing the language if cerntain conditions are met.
+ // See removePreloadEnginesByLanguageCode_() for details.
+ if (!this.removePreloadEnginesByLanguageCode_(languageCode)) {
+ this.showNotification_(
+ localStrings.getString('please_add_another_language'),
+ localStrings.getString('ok_button'));
+ return;
+ }
}
languageOptionsList.removeSelectedLanguage();
},
« no previous file with comments | « chrome/browser/resources/options/language_options.html ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698