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

Delta Between Two Patch Sets: lib/whitelisting.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Left Patch Set: Workaround limiation with iterating element collections in older versions of Chrome Created Jan. 16, 2017, 8:46 a.m.
Right Patch Set: Addressed some more feedback Created Jan. 18, 2017, 11:44 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/utils.js ('k') | notification.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 whitelisting */ 18 /** @module whitelisting */
19 19
20 "use strict"; 20 "use strict";
21 21
22 let {defaultMatcher} = require("matcher"); 22 const {defaultMatcher} = require("matcher");
23 let {RegExpFilter} = require("filterClasses"); 23 const {RegExpFilter} = require("filterClasses");
24 let {DownloadableSubscription} = require("subscriptionClasses"); 24 const {DownloadableSubscription} = require("subscriptionClasses");
25 let {FilterNotifier} = require("filterNotifier"); 25 const {FilterNotifier} = require("filterNotifier");
26 let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = req uire("url"); 26 const {stringifyURL, getDecodedHostname,
27 let {port} = require("messaging"); 27 extractHostFromFrame, isThirdParty} = require("url");
28 let devtools = require("devtools"); 28 const {port} = require("messaging");
29 let {verifySignature} = require("rsa"); 29 const devtools = require("devtools");
30 const {verifySignature} = require("rsa");
30 31
31 let sitekeys = new ext.PageMap(); 32 let sitekeys = new ext.PageMap();
32 33
33 function match(page, url, typeMask, docDomain, sitekey) 34 function match(page, url, typeMask, docDomain, sitekey)
34 { 35 {
35 let thirdParty = !!docDomain && isThirdParty(url, docDomain); 36 let thirdParty = !!docDomain && isThirdParty(url, docDomain);
36 let urlString = stringifyURL(url); 37 let urlString = stringifyURL(url);
37 38
38 if (!docDomain) 39 if (!docDomain)
39 docDomain = getDecodedHostname(url); 40 docDomain = getDecodedHostname(url);
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 196
196 if (typeof chrome == "object") 197 if (typeof chrome == "object")
197 chrome.webRequest.onHeadersReceived.addListener( 198 chrome.webRequest.onHeadersReceived.addListener(
198 onHeadersReceived, 199 onHeadersReceived,
199 { 200 {
200 urls: ["http://*/*", "https://*/*"], 201 urls: ["http://*/*", "https://*/*"],
201 types: ["main_frame", "sub_frame"] 202 types: ["main_frame", "sub_frame"]
202 }, 203 },
203 ["responseHeaders"] 204 ["responseHeaders"]
204 ); 205 );
LEFTRIGHT

Powered by Google App Engine
This is Rietveld