diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 00:04:02 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 00:04:02 +0000 |
| commit | 25e69ce473f90e823080d43586cf6c9240be4f13 (patch) | |
| tree | 0ab169633f9fbafef9f388c87ff7b12c320c2744 /chrome/browser/resources | |
| parent | 0a9c906458501e77a941ab107f2e1a9832a61e8c (diff) | |
| download | chromium_src-25e69ce473f90e823080d43586cf6c9240be4f13.zip chromium_src-25e69ce473f90e823080d43586cf6c9240be4f13.tar.gz chromium_src-25e69ce473f90e823080d43586cf6c9240be4f13.tar.bz2 | |
web-ui settings: Sort the encodings list to match that of the Wrench menu. Also allow the encoding menu to be wider.
BUG=70187
TEST=Verify that the encoding list in Settings matches the Wrench menu.
Review URL: http://codereview.chromium.org/6596053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/options/font_settings.html | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/options/font_settings.js | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/resources/options/font_settings.html b/chrome/browser/resources/options/font_settings.html index 398250a..3fa1ac9 100644 --- a/chrome/browser/resources/options/font_settings.html +++ b/chrome/browser/resources/options/font_settings.html @@ -59,7 +59,7 @@ <h3 i18n-content="fontSettingsEncoding"></h3> <div class="font-input-div"> <div> - <select id="font-encoding" class="font-input" dataType="string" + <select id="font-encoding" dataType="string" pref="intl.charset_default" metric="Options_ChangeFontEncoding" disabled></select> </div> diff --git a/chrome/browser/resources/options/font_settings.js b/chrome/browser/resources/options/font_settings.js index b295324..00a43e9 100644 --- a/chrome/browser/resources/options/font_settings.js +++ b/chrome/browser/resources/options/font_settings.js @@ -129,8 +129,12 @@ cr.define('options', function() { for (var i = 0; i < items.length; i++) { value = items[i][0]; text = items[i][1]; - selected = value == selectedValue; - element.appendChild(new Option(text, value, false, selected)); + if (text) { + selected = value == selectedValue; + element.appendChild(new Option(text, value, false, selected)); + } else { + element.appendChild(document.createElement('hr')); + } } // Enable if not a managed pref. |