OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
16 */ | 16 */ |
17 | 17 |
18 /** @module popupBlocker */ | 18 /** @module popupBlocker */ |
19 | 19 |
20 "use strict"; | 20 "use strict"; |
21 | 21 |
22 const {defaultMatcher} = require("matcher"); | 22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
23 const {BlockingFilter, RegExpFilter} = require("filterClasses"); | 23 const {BlockingFilter, |
24 const {stringifyURL, isThirdParty, extractHostFromFrame} = require("url"); | 24 RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); |
25 const {checkWhitelisted} = require("whitelisting"); | 25 const {stringifyURL, isThirdParty, extractHostFromFrame} = require("./url"); |
26 const {logRequest} = require("devtools"); | 26 const {checkWhitelisted} = require("./whitelisting"); |
| 27 const {logRequest} = require("./devtools"); |
27 | 28 |
28 let loadingPopups = new Map(); | 29 let loadingPopups = new Map(); |
29 | 30 |
30 function forgetPopup(tabId) | 31 function forgetPopup(tabId) |
31 { | 32 { |
32 loadingPopups.delete(tabId); | 33 loadingPopups.delete(tabId); |
33 | 34 |
34 if (loadingPopups.size == 0) | 35 if (loadingPopups.size == 0) |
35 { | 36 { |
36 browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged); | 37 browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged); |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 { | 124 { |
124 forgetPopup(details.tabId); | 125 forgetPopup(details.tabId); |
125 } | 126 } |
126 else | 127 else |
127 { | 128 { |
128 popup.sourceFrame = frame; | 129 popup.sourceFrame = frame; |
129 checkPotentialPopup(details.tabId, popup); | 130 checkPotentialPopup(details.tabId, popup); |
130 } | 131 } |
131 }); | 132 }); |
132 } | 133 } |
OLD | NEW |