chrome/browser/resources/settings/site_settings/site_details_permission.js - Issue 2021343003: MD Site Settings: Add five new top level categories

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/settings/site_settings/site_details_permission.js

Issue 2021343003: MD Site Settings: Add five new top level categories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Unit test fix Created 4 years, 7 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/settings/site_settings/site_details.html ('K') | « chrome/browser/resources/settings/site_settings/site_details.html ('k') | chrome/browser/resources/settings/site_settings/site_list.html » ('j') | chrome/browser/resources/settings/site_settings/site_settings_behavior.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/site_settings/site_details_permission.js

diff --git a/chrome/browser/resources/settings/site_settings/site_details_permission.js b/chrome/browser/resources/settings/site_settings/site_details_permission.js

index 7ac2f6f59281401bb858847eb0975ea8da5f675f..9cd6acb4ae4e281e9616b8570d61f371399f0f8e 100644

--- a/chrome/browser/resources/settings/site_settings/site_details_permission.js

+++ b/chrome/browser/resources/settings/site_settings/site_details_permission.js

@@ -51,7 +51,8 @@ Polymer({

this.browserProxy.getExceptionList(this.category).then(

function(exceptionList) {

for (var i = 0; i < exceptionList.length; ++i) {

- if (exceptionList[i].origin == site.origin) {

+ var origin = this.removePatternWildcard_(exceptionList[i].origin);

+ if (origin == this.removePatternWildcard_(site.origin)) {

michaelpg 2016/06/02 12:58:30 nit: you could make a comparison function instead

Finnur 2016/06/02 17:31:36 Done.

michaelpg 2016/06/03 13:37:14 Thanks, definitely more readable!

this.$.permission.selected = exceptionList[i].setting;

this.$.details.hidden = false;

}