summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 00:19:47 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 00:19:47 +0000
commitd1005938c383246faf5479a6d888f5fd25b8bf26 (patch)
tree2f26dad3c984dba9b023c8d8dedc140be3541ae4
parent12b37dc8e0ac8395342754e49f6ac4ab48e08015 (diff)
downloadchromium_src-d1005938c383246faf5479a6d888f5fd25b8bf26.zip
chromium_src-d1005938c383246faf5479a6d888f5fd25b8bf26.tar.gz
chromium_src-d1005938c383246faf5479a6d888f5fd25b8bf26.tar.bz2
dom-ui options: Fix incorrect handling of undefined values in pref UI.
BUG=none TEST=Verify preference UI works properly in dom-ui options window. Review URL: http://codereview.chromium.org/3170042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57262 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/pref_ui.js40
1 files changed, 20 insertions, 20 deletions
diff --git a/chrome/browser/resources/options/pref_ui.js b/chrome/browser/resources/options/pref_ui.js
index 37ba573..e811231 100644
--- a/chrome/browser/resources/options/pref_ui.js
+++ b/chrome/browser/resources/options/pref_ui.js
@@ -25,10 +25,10 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
- self.checked = event.value['value'] ? event.value['value']
- : event.value;
- self.managed = event.value['managed'] ? event.value['managed']
- : false;
+ self.checked = event.value['value'] != undefined ?
+ event.value['value'] : event.value;
+ self.managed = event.value['managed'] != undefined ?
+ event.value['managed'] : false;
self.disabled = self.managed;
});
@@ -72,10 +72,10 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
- var value = event.value['value'] ? event.value['value']
- : event.value;
- self.managed = event.value['managed'] ? event.value['managed']
- : false;
+ var value = event.value['value'] != undefined ?
+ event.value['value'] : event.value;
+ self.managed = event.value['managed'] != undefined ?
+ event.value['managed'] : false;
self.checked = String(value) == self.value;
self.disabled = self.managed;
});
@@ -132,10 +132,10 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
- self.value = event.value['value'] ? event.value['value']
- : event.value;
- self.managed = event.value['managed'] ? event.value['managed']
- : false;
+ self.value = event.value['value'] != undefined ?
+ event.value['value'] : event.value;
+ self.managed = event.value['managed'] != undefined ?
+ event.value['managed'] : false;
self.disabled = self.managed;
});
@@ -215,10 +215,10 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
- var value = event.value['value'] ? event.value['value']
- : event.value;
- self.managed = event.value['managed'] ? event.value['managed']
- : false;
+ var value = event.value['value'] != undefined ?
+ event.value['value'] : event.value;
+ self.managed = event.value['managed'] != undefined ?
+ event.value['managed'] : false;
self.disabled = self.managed;
for (var i = 0; i < self.options.length; i++) {
if (self.options[i].value == value) {
@@ -307,10 +307,10 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
- self.value = event.value['value'] ? event.value['value']
- : event.value;
- self.managed = event.value['managed'] ? event.value['managed']
- : false;
+ self.value = event.value['value'] != undefined ?
+ event.value['value'] : event.value;
+ self.managed = event.value['managed'] != undefined ?
+ event.value['managed'] : false;
self.disabled = self.managed;
});