Unified Diff: lib/filterComposer.js
Issue 29907589:
Issue 7054 - Update the adblockpluscore dependency to 5cb695da5a40, adblockplusui to f86abf2efdfd (Closed)
Patch Set: Address PS7 comment
Created Dec. 17, 2018, 7:38 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,17 +86,17 @@ |
| 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 filter = defaultMatcher.matchesAny( |
|
Manish Jethani
2018/12/18 17:12:16
We need to use the new `isWhitelisted` function he
Jon Sonesen
2018/12/19 10:05:21
Done.
kzar
2018/12/19 10:16:52
Nit: I have to agree with Manish, `whitelisted` or
|
| urlObj.href, typeMask, docDomain, |
| isThirdParty(urlObj, docDomain), |
| getKey(page, frame), specificOnly |
| ); |
| if (!filter) |
| { |
| let filterText = urlObj.href.replace(/^[\w-]+:\/+(?:www\.)?/, "||"); |
« lib/devtools.js ('K')
|
« lib/devtools.js ('k')
|
lib/firefoxDataCleanup.js » ('j')
|
no next file with comments »
