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

Unified Diff: background.js

Issue 29335874: Issue 3636 - Make element collapsing logic consider $genericblock (Closed)
Patch Set: Created Feb. 6, 2016, 1:20 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: background.js
===================================================================
--- a/background.js
+++ b/background.js
@@ -329,12 +329,18 @@
var sitekey = getKey(sender.page, sender.frame);
var blocked = false;
+ var specificOnly = checkWhitelisted(
+ sender.page, sender.frame,
+ RegExpFilter.typeMap.GENERICBLOCK
+ );
+
for (var i = 0; i < msg.urls.length; i++)
{
var url = new URL(msg.urls[i], msg.baseURL);
var filter = defaultMatcher.matchesAny(
stringifyURL(url), typeMask,
- documentHost, isThirdParty(url, documentHost), sitekey
+ documentHost, isThirdParty(url, documentHost),
+ sitekey, specificOnly
);
if (filter instanceof BlockingFilter)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld