Unified Diff: lib/filterComposer.js
Issue 29907589:
Issue 7054 - Update the adblockpluscore dependency to 5cb695da5a40, adblockplusui to f86abf2efdfd (Closed)
Patch Set: Address PS11 Comments
Created Jan. 7, 2019, 10:11 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/devtools.js ('K')
|
« lib/devtools.js ('k')
|
lib/firefoxDataCleanup.js » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/filterComposer.js |
| =================================================================== |
| --- a/lib/filterComposer.js |
| +++ b/lib/filterComposer.js |
| @@ -86,23 +86,23 @@ |
| let docDomain = extractHostFromFrame(frame); |
| let specificOnly = checkWhitelisted(page, frame, null, |
| RegExpFilter.typeMap.GENERICBLOCK); |
| // Add a blocking filter for each URL of the element that can be blocked |
| for (let url of details.urls) |
| { |
| let urlObj = new URL(url, details.baseURL); |
| - let filter = defaultMatcher.whitelist.matchesAny( |
| + let whitelisted = defaultMatcher.isWhitelisted( |
| urlObj.href, typeMask, docDomain, |
| isThirdParty(urlObj, docDomain), |
| getKey(page, frame), specificOnly |
| ); |
| - if (!filter) |
| + if (!whitelisted) |
| { |
| let filterText = urlObj.href.replace(/^[\w-]+:\/+(?:www\.)?/, "||"); |
| if (specificOnly) |
| filterText += "$domain=" + docDomain; |
| if (!filters.includes(filterText)) |
| filters.push(filterText); |
« lib/devtools.js ('K')
|
« lib/devtools.js ('k')
|
lib/firefoxDataCleanup.js » ('j')
|
no next file with comments »
