OLD | NEW |
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 var RegExpFilter = require("filterClasses").RegExpFilter; | 18 "use strict"; |
19 var ElemHide = require("elemHide").ElemHide; | |
20 var checkWhitelisted = require("whitelisting").checkWhitelisted; | |
21 var extractHostFromFrame = require("url").extractHostFromFrame; | |
22 var port = require("messaging").port; | |
23 var devtools = require("devtools"); | |
24 | 19 |
25 port.on("get-selectors", function(msg, sender) | 20 let {RegExpFilter} = require("filterClasses"); |
| 21 let {ElemHide} = require("elemHide"); |
| 22 let {checkWhitelisted} = require("whitelisting"); |
| 23 let {extractHostFromFrame} = require("url"); |
| 24 let {port} = require("messaging"); |
| 25 let devtools = require("devtools"); |
| 26 |
| 27 port.on("get-selectors", (msg, sender) => |
26 { | 28 { |
27 var selectors; | 29 let selectors; |
28 var trace = devtools && devtools.hasPanel(sender.page); | 30 let trace = devtools && devtools.hasPanel(sender.page); |
29 | 31 |
30 if (!checkWhitelisted(sender.page, sender.frame, | 32 if (!checkWhitelisted(sender.page, sender.frame, |
31 RegExpFilter.typeMap.DOCUMENT | | 33 RegExpFilter.typeMap.DOCUMENT | |
32 RegExpFilter.typeMap.ELEMHIDE)) | 34 RegExpFilter.typeMap.ELEMHIDE)) |
33 { | 35 { |
34 var specificOnly = checkWhitelisted(sender.page, sender.frame, | 36 let specificOnly = checkWhitelisted(sender.page, sender.frame, |
35 RegExpFilter.typeMap.GENERICHIDE); | 37 RegExpFilter.typeMap.GENERICHIDE); |
36 selectors = ElemHide.getSelectorsForDomain( | 38 selectors = ElemHide.getSelectorsForDomain( |
37 extractHostFromFrame(sender.frame), | 39 extractHostFromFrame(sender.frame), |
38 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING | 40 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING |
39 ); | 41 ); |
40 } | 42 } |
41 else | 43 else |
42 { | 44 { |
43 selectors = []; | 45 selectors = []; |
44 } | 46 } |
45 | 47 |
46 return {selectors: selectors, trace: trace}; | 48 return {selectors: selectors, trace: trace}; |
47 }); | 49 }); |
48 | 50 |
49 port.on("forward", function(msg, sender) | 51 port.on("forward", (msg, sender) => |
50 { | 52 { |
51 var targetPage; | 53 let targetPage; |
52 if (msg.targetPageId) | 54 if (msg.targetPageId) |
53 targetPage = ext.getPage(msg.targetPageId); | 55 targetPage = ext.getPage(msg.targetPageId); |
54 else | 56 else |
55 targetPage = sender.page; | 57 targetPage = sender.page; |
56 | 58 |
57 if (targetPage) | 59 if (targetPage) |
58 { | 60 { |
59 msg.payload.sender = sender.page.id; | 61 msg.payload.sender = sender.page.id; |
60 if (msg.expectsResponse) | 62 if (msg.expectsResponse) |
61 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); | 63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); |
62 targetPage.sendMessage(msg.payload); | 64 targetPage.sendMessage(msg.payload); |
63 } | 65 } |
64 }); | 66 }); |
OLD | NEW |