lib/filterComposer.js - Issue 6393086494113792: Issue 154 - Added devtools panel showing blocked and blockable items

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 6393086494113792: Issue 154 - Added devtools panel showing blocked and blockable items (Closed)

Patch Set: Adapt for UI changes generating domain specific filters when necessary Created Feb. 3, 2016, 10:40 a.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,7 @@

/** @module filterComposer */

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

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

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

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

let {RegExpFilter} = require("filterClasses");

@@ -92,7 +92,7 @@

let page = details.page;

let frame = details.frame;

- if (!isFrameWhitelisted(page, frame, RegExpFilter.typeMap.DOCUMENT))

+ if (!checkWhitelisted(page, frame))

{

let typeMask = RegExpFilter.typeMap[details.type];

let docDomain = extractHostFromFrame(frame);

@@ -124,7 +124,7 @@

// If we couldn't generate any blocking filters, fallback to element hiding

let selectors = [];

- if (filters.length == 0 && !isFrameWhitelisted(page, frame, RegExpFilter.typeMap.ELEMHIDE))

+ if (filters.length == 0 && !checkWhitelisted(page, frame, RegExpFilter.typeMap.ELEMHIDE))

{

// Generate CSS selectors based on the element's "id" and "class" attribute

if (isValidString(details.id))

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