Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/filterComposer.js

Issue 6393086494113792: Issue 154 - Added devtools panel showing blocked and blockable items (Closed)
Patch Set: Fixed typo in JSDoc syntax Created Feb. 2, 2016, 4:31 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/devtools.js ('k') | lib/whitelisting.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
@@ -120,7 +120,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 »

Powered by Google App Engine
This is Rietveld