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

Side by Side Diff: lib/popupBlocker.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Patch Set: Define and destructure backgroundPage more consistently, fix minor whitespace errors Created Jan. 18, 2017, 7:34 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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 let {defaultMatcher} = require("matcher"); 22 const {defaultMatcher} = require("matcher");
23 let {BlockingFilter} = require("filterClasses"); 23 const {BlockingFilter} = require("filterClasses");
24 let {stringifyURL, isThirdParty, extractHostFromFrame} = require("url"); 24 const {stringifyURL, isThirdParty, extractHostFromFrame} = require("url");
25 let {checkWhitelisted} = require("whitelisting"); 25 const {checkWhitelisted} = require("whitelisting");
26 let {logRequest} = require("devtools"); 26 const {logRequest} = require("devtools");
27 27
28 let loadingPopups = Object.create(null); 28 let loadingPopups = Object.create(null);
29 29
30 function hasLoadingPopups() 30 function hasLoadingPopups()
31 { 31 {
32 return Object.keys(loadingPopups).length > 0; 32 return Object.keys(loadingPopups).length > 0;
33 } 33 }
34 34
35 function forgetPopup(tabId) 35 function forgetPopup(tabId)
36 { 36 {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 if (checkWhitelisted(popup.sourcePage, frame)) 115 if (checkWhitelisted(popup.sourcePage, frame))
116 { 116 {
117 forgetPopup(tabId); 117 forgetPopup(tabId);
118 } 118 }
119 else 119 else
120 { 120 {
121 popup.sourceFrame = frame; 121 popup.sourceFrame = frame;
122 checkPotentialPopup(tabId, popup); 122 checkPotentialPopup(tabId, popup);
123 } 123 }
124 }); 124 });
OLDNEW

Powered by Google App Engine
This is Rietveld