lib/filterComposer.js - Issue 5733398375038976: Issue 2132 - Only match exception rules when checking whether a page/frame is whitelisted

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: lib/filterComposer.js

Issue 5733398375038976: Issue 2132 - Only match exception rules when checking whether a page/frame is whitelisted (Closed)

Patch Set: Created March 12, 2015, 7:33 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: lib/filterComposer.js

===================================================================

--- a/lib/filterComposer.js

+++ b/lib/filterComposer.js

@@ -18,7 +18,6 @@

let {extractHostFromFrame, stringifyURL, isThirdParty} = require("url");

let {getKey, isFrameWhitelisted} = require("whitelisting");

let {defaultMatcher} = require("matcher");

-let {WhitelistFilter} = require("filterClasses");

function escapeChar(chr)

{

@@ -97,13 +96,13 @@

{

url = stringifyURL(urlObj);

- let filter = defaultMatcher.matchesAny(

+ let filter = defaultMatcher.whitelist.matchesAny(

url, details.type, docDomain,

isThirdParty(urlObj, docDomain),

getKey(page, frame)

);

- if (!(filter instanceof WhitelistFilter))

+ if (!filter)

{

let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");

« no previous file with comments | « no previous file | lib/whitelisting.js » ('j') | no next file with comments »