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

Side by Side Diff: lib/popupBlocker.js

Issue 29715577: Issue 6449 - Switch to Harmony modules (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Add lib/.eslintrc.json Created March 6, 2018, 10:30 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 import {defaultMatcher} from "matcher";
21 21 import {BlockingFilter, RegExpFilter} from "filterClasses";
22 const {defaultMatcher} = require("matcher"); 22 import {stringifyURL, isThirdParty, extractHostFromFrame} from "url";
23 const {BlockingFilter, RegExpFilter} = require("filterClasses"); 23 import {checkWhitelisted} from "whitelisting";
24 const {stringifyURL, isThirdParty, extractHostFromFrame} = require("url"); 24 import {logRequest} from "devtools";
25 const {checkWhitelisted} = require("whitelisting");
26 const {logRequest} = require("devtools");
27 25
28 let loadingPopups = new Map(); 26 let loadingPopups = new Map();
29 27
30 function forgetPopup(tabId) 28 function forgetPopup(tabId)
31 { 29 {
32 loadingPopups.delete(tabId); 30 loadingPopups.delete(tabId);
33 31
34 if (loadingPopups.size == 0) 32 if (loadingPopups.size == 0)
35 { 33 {
36 browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged); 34 browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 { 121 {
124 forgetPopup(details.tabId); 122 forgetPopup(details.tabId);
125 } 123 }
126 else 124 else
127 { 125 {
128 popup.sourceFrame = frame; 126 popup.sourceFrame = frame;
129 checkPotentialPopup(details.tabId, popup); 127 checkPotentialPopup(details.tabId, popup);
130 } 128 }
131 }); 129 });
132 } 130 }
OLDNEW
« lib/.eslintrc.json ('K') | « lib/options.js ('k') | lib/prefs.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld