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

Side by Side Diff: lib/whitelisting.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 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 13 matching lines...) Expand all
53 let checkWhitelisted = 54 let checkWhitelisted =
54 /** 55 /**
55 * Gets the active whitelisting filter for the document associated 56 * Gets the active whitelisting filter for the document associated
56 * with the given page/frame, or null if it's not whitelisted. 57 * with the given page/frame, or null if it's not whitelisted.
57 * 58 *
58 * @param {Page} page 59 * @param {Page} page
59 * @param {Frame} [frame] 60 * @param {Frame} [frame]
60 * @param {number} [typeMask=RegExpFilter.typeMap.DOCUMENT] 61 * @param {number} [typeMask=RegExpFilter.typeMap.DOCUMENT]
61 * @return {?WhitelistFilter} 62 * @return {?WhitelistFilter}
62 */ 63 */
63 exports.checkWhitelisted = function(page, frame, typeMask) 64 exports.checkWhitelisted = (page, frame, typeMask) =>
64 { 65 {
65 if (typeof typeMask == "undefined") 66 if (typeof typeMask == "undefined")
66 typeMask = RegExpFilter.typeMap.DOCUMENT; 67 typeMask = RegExpFilter.typeMap.DOCUMENT;
67 68
68 if (frame) 69 if (frame)
69 { 70 {
70 let filter = null; 71 let filter = null;
71 72
72 while (frame && !filter) 73 while (frame && !filter)
73 { 74 {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 112
112 let getKey = 113 let getKey =
113 /** 114 /**
114 * Gets the public key, previously recorded for the given page 115 * Gets the public key, previously recorded for the given page
115 * and frame, to be considered for the $sitekey filter option. 116 * and frame, to be considered for the $sitekey filter option.
116 * 117 *
117 * @param {Page} page 118 * @param {Page} page
118 * @param {Frame} frame 119 * @param {Frame} frame
119 * @return {string} 120 * @return {string}
120 */ 121 */
121 exports.getKey = function(page, frame) 122 exports.getKey = (page, frame) =>
122 { 123 {
123 let keys = sitekeys.get(page); 124 let keys = sitekeys.get(page);
124 if (!keys) 125 if (!keys)
125 return null; 126 return null;
126 127
127 for (; frame != null; frame = frame.parent) 128 for (; frame != null; frame = frame.parent)
128 { 129 {
129 let key = keys[stringifyURL(frame.url)]; 130 let key = keys[stringifyURL(frame.url)];
130 if (key) 131 if (key)
131 return key; 132 return key;
(...skipping 63 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 );
OLDNEW

Powered by Google App Engine
This is Rietveld