Unified Diff: lib/popupBlocker.js
Issue 29991594:
Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702 (Closed)
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set:
Created Jan. 29, 2019, 4:36 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/csp.js ('K')
|
« lib/hitLogger.js ('k')
|
lib/publicSuffixList.js » ('j')
|
qunit/tests/url.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/popupBlocker.js |
| =================================================================== |
| --- a/lib/popupBlocker.js |
| +++ b/lib/popupBlocker.js |
| @@ -17,17 +17,18 @@ |
| /** @module popupBlocker */ |
| "use strict"; |
| const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| const {BlockingFilter, |
| RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); |
| -const {isThirdParty, extractHostFromFrame} = require("./url"); |
| +const {isThirdParty} = require("../adblockpluscore/lib/domain"); |
| +const {extractHostFromFrame} = require("./url"); |
| const {checkWhitelisted} = require("./whitelisting"); |
| const {logRequest} = require("./hitLogger"); |
| let loadingPopups = new Map(); |
| function forgetPopup(tabId) |
| { |
| loadingPopups.delete(tabId); |
« lib/csp.js ('K')
|
« lib/hitLogger.js ('k')
|
lib/publicSuffixList.js » ('j')
|
qunit/tests/url.js » ('J')
