Skip to content

GitLab

T
tangled
Commit 0956a677 authored by csilv@chromium.org's avatar csilv@chromium.org
Browse files
Options

Tweak preference code to work with or without the 'managed' property, makes for easier use on CrOS. 

BUG=none
TEST=Verify CrOS preferences working properly in dom-ui options window.
Review URL: http://codereview.chromium.org/3174032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57216 0039d316-1c4b-4281-b951-d872f2087c98
parent f86c2324
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 10 deletions
chrome/browser/resources/options/pref_ui.js
View file @ 0956a677
......@@ -25,9 +25,11 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
self.managed = event.value['managed']
self.checked = event.value['value'] ? event.value['value']
: event.value;
self.managed = event.value['managed'] ? event.value['managed']
: false;
self.disabled = self.managed;
self.checked = event.value['value'];
});
// Listen to user events.
......@@ -70,9 +72,12 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
self.managed = event.value['managed']
var value = event.value['value'] ? event.value['value']
: event.value;
self.managed = event.value['managed'] ? event.value['managed']
: false;
self.checked = String(value) == self.value;
self.disabled = self.managed;
self.checked = String(event.value['value']) == self.value;
});
// Listen to user events.
......@@ -127,9 +132,11 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
self.managed = event.value['managed']
self.value = event.value['value'] ? event.value['value']
: event.value;
self.managed = event.value['managed'] ? event.value['managed']
: false;
self.disabled = self.managed;
self.value = event.value['value'];
});
// Listen to user events.
......@@ -208,10 +215,13 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
self.managed = event.value['managed']
var value = event.value['value'] ? event.value['value']
: event.value;
self.managed = event.value['managed'] ? event.value['managed']
: false;
self.disabled = self.managed;
for (var i = 0; i < self.options.length; i++) {
if (self.options[i].value == event.value['value']) {
if (self.options[i].value == value) {
self.selectedIndex = i;
return;
}
......@@ -297,9 +307,11 @@ cr.define('options', function() {
// Listen to pref changes.
Preferences.getInstance().addEventListener(this.pref,
function(event) {
self.managed = event.value['managed']
self.value = event.value['value'] ? event.value['value']
: event.value;
self.managed = event.value['managed'] ? event.value['managed']
: false;
self.disabled = self.managed;
self.value = event.value['value'];
});
// Listen to user events.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment