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

Delta Between Two Patch Sets: background.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Left Patch Set: "use strict"; Created Jan. 16, 2017, 3:30 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 | « no previous file | chrome/ext/background.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 "use strict"; 18 "use strict";
19 19
20 let RegExpFilter = require("filterClasses").RegExpFilter; 20 const {RegExpFilter} = require("filterClasses");
21 let ElemHide = require("elemHide").ElemHide; 21 const {ElemHide} = require("elemHide");
22 let checkWhitelisted = require("whitelisting").checkWhitelisted; 22 const {checkWhitelisted} = require("whitelisting");
23 let extractHostFromFrame = require("url").extractHostFromFrame; 23 const {extractHostFromFrame} = require("url");
24 let port = require("messaging").port; 24 const {port} = require("messaging");
25 let devtools = require("devtools"); 25 const devtools = require("devtools");
26 26
27 port.on("get-selectors", (msg, sender) => 27 port.on("get-selectors", (msg, sender) =>
28 { 28 {
29 let selectors; 29 let selectors;
30 let trace = devtools && devtools.hasPanel(sender.page); 30 let trace = devtools && devtools.hasPanel(sender.page);
31 31
32 if (!checkWhitelisted(sender.page, sender.frame, 32 if (!checkWhitelisted(sender.page, sender.frame,
33 RegExpFilter.typeMap.DOCUMENT | 33 RegExpFilter.typeMap.DOCUMENT |
34 RegExpFilter.typeMap.ELEMHIDE)) 34 RegExpFilter.typeMap.ELEMHIDE))
35 { 35 {
(...skipping 21 matching lines...) Expand all
57 targetPage = sender.page; 57 targetPage = sender.page;
58 58
59 if (targetPage) 59 if (targetPage)
60 { 60 {
61 msg.payload.sender = sender.page.id; 61 msg.payload.sender = sender.page.id;
62 if (msg.expectsResponse) 62 if (msg.expectsResponse)
63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); 63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload));
64 targetPage.sendMessage(msg.payload); 64 targetPage.sendMessage(msg.payload);
65 } 65 }
66 }); 66 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld