chrome/browser/resources/options2/content_settings_exceptions_area.js - Issue 9316086: Fix JavaScript errors in options2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/options2/content_settings_exceptions_area.js

Issue 9316086: Fix JavaScript errors in options2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use list join Created 8 years, 10 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

« chrome/browser/resources/options2/certificate_tree.js ('K') | « chrome/browser/resources/options2/content_settings.js ('k') | chrome/browser/resources/options2/controlled_setting.js » ('j') | chrome/browser/resources/options2/manage_profile_overlay.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options2/content_settings_exceptions_area.js

diff --git a/chrome/browser/resources/options2/content_settings_exceptions_area.js b/chrome/browser/resources/options2/content_settings_exceptions_area.js

index 192231f32e2e4ff45dc5e56a0e046bf51d27f15d..ccec46841d235ea34235c590f09839877a650eff 100644

--- a/chrome/browser/resources/options2/content_settings_exceptions_area.js

+++ b/chrome/browser/resources/options2/content_settings_exceptions_area.js

@@ -120,7 +120,7 @@ cr.define('options.contentSettings', function() {

// If the source of the content setting exception is not the user

// preference, then the content settings exception is managed and the user

// can't edit it.

- if (this.dataItem.source &&

+ if (this.dataItem.source &&

this.dataItem.source != 'preference') {

this.setAttribute('managedby', this.dataItem.source);

this.deletable = false;