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

Side by Side Diff: lib/requestBlocker.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Patch Set: Use const as per the new rules Created Jan. 18, 2017, 7:23 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
« no previous file with comments | « lib/prefs.js ('k') | lib/stats.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 requestBlocker */ 18 /** @module requestBlocker */
19 19
20 "use strict"; 20 "use strict";
21 21
22 let {Filter, RegExpFilter, BlockingFilter} = require("filterClasses"); 22 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses");
23 let {Subscription} = require("subscriptionClasses"); 23 const {Subscription} = require("subscriptionClasses");
24 let {defaultMatcher} = require("matcher"); 24 const {defaultMatcher} = require("matcher");
25 let {FilterNotifier} = require("filterNotifier"); 25 const {FilterNotifier} = require("filterNotifier");
26 let {Prefs} = require("prefs"); 26 const {Prefs} = require("prefs");
27 let {checkWhitelisted, getKey} = require("whitelisting"); 27 const {checkWhitelisted, getKey} = require("whitelisting");
28 let {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); 28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url");
29 let {port} = require("messaging"); 29 const {port} = require("messaging");
30 let devtools = require("devtools"); 30 const devtools = require("devtools");
31 31
32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. 32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
33 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; 33 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
34 34
35 function onBeforeRequestAsync(page, url, type, docDomain, 35 function onBeforeRequestAsync(page, url, type, docDomain,
36 thirdParty, sitekey, 36 thirdParty, sitekey,
37 specificOnly, filter) 37 specificOnly, filter)
38 { 38 {
39 if (filter) 39 if (filter)
40 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page); 40 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 FilterNotifier.on("subscription.added", onFilterChange); 146 FilterNotifier.on("subscription.added", onFilterChange);
147 FilterNotifier.on("subscription.removed", onFilterChange); 147 FilterNotifier.on("subscription.removed", onFilterChange);
148 FilterNotifier.on("subscription.updated", onFilterChange); 148 FilterNotifier.on("subscription.updated", onFilterChange);
149 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true)); 149 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
150 FilterNotifier.on("filter.added", onFilterChange); 150 FilterNotifier.on("filter.added", onFilterChange);
151 FilterNotifier.on("filter.removed", onFilterChange); 151 FilterNotifier.on("filter.removed", onFilterChange);
152 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); 152 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
153 FilterNotifier.on("load", onFilterChange); 153 FilterNotifier.on("load", onFilterChange);
154 154
155 port.on("request.websocket", function(msg, sender) 155 port.on("request.websocket", (msg, sender) =>
156 { 156 {
157 return ext.webRequest.onBeforeRequest._dispatch( 157 return ext.webRequest.onBeforeRequest._dispatch(
158 new URL(msg.url), 158 new URL(msg.url),
159 "WEBSOCKET", 159 "WEBSOCKET",
160 sender.page, 160 sender.page,
161 sender.frame 161 sender.frame
162 ).indexOf(false) != -1; 162 ).indexOf(false) != -1;
163 }); 163 });
OLDNEW
« no previous file with comments | « lib/prefs.js ('k') | lib/stats.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld