Left: | ||
Right: |
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-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 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 const {RegExpFilter} = require("filterClasses"); | 20 const {RegExpFilter} = require("filterClasses"); |
21 const {ElemHide} = require("elemHide"); | 21 const {ElemHide} = require("elemHide"); |
22 const {checkWhitelisted} = require("whitelisting"); | 22 const {checkWhitelisted} = require("whitelisting"); |
23 const {extractHostFromFrame} = require("url"); | 23 const {extractHostFromFrame} = require("url"); |
24 const {hideElements} = require("css"); | |
24 const {port} = require("messaging"); | 25 const {port} = require("messaging"); |
25 const devtools = require("devtools"); | 26 const devtools = require("devtools"); |
26 | 27 |
28 let tryInsertCSS = typeof browser != "undefined"; | |
29 | |
27 port.on("get-selectors", (msg, sender) => | 30 port.on("get-selectors", (msg, sender) => |
28 { | 31 { |
29 let selectors; | 32 let selectors; |
30 let trace = devtools && devtools.hasPanel(sender.page); | 33 let trace = devtools && devtools.hasPanel(sender.page); |
31 | 34 |
32 if (!checkWhitelisted(sender.page, sender.frame, | 35 if (!checkWhitelisted(sender.page, sender.frame, |
33 RegExpFilter.typeMap.DOCUMENT | | 36 RegExpFilter.typeMap.DOCUMENT | |
34 RegExpFilter.typeMap.ELEMHIDE)) | 37 RegExpFilter.typeMap.ELEMHIDE)) |
35 { | 38 { |
36 let specificOnly = checkWhitelisted(sender.page, sender.frame, | 39 let specificOnly = checkWhitelisted(sender.page, sender.frame, |
37 RegExpFilter.typeMap.GENERICHIDE); | 40 RegExpFilter.typeMap.GENERICHIDE); |
38 selectors = ElemHide.getSelectorsForDomain( | 41 selectors = ElemHide.getSelectorsForDomain( |
39 extractHostFromFrame(sender.frame), | 42 extractHostFromFrame(sender.frame), |
40 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING | 43 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING |
41 ); | 44 ); |
42 } | 45 } |
43 else | 46 else |
44 { | 47 { |
45 selectors = []; | 48 selectors = []; |
46 } | 49 } |
47 | 50 |
48 return {selectors, trace}; | 51 if (!tryInsertCSS) |
Sebastian Noack
2017/04/12 12:21:18
Chrome and Firefox should use the same code path.
Manish Jethani
2017/04/12 12:32:30
We have to remember whether it failed so we don't
Sebastian Noack
2017/04/12 12:54:43
Chrome is also going to add support for user style
Wladimir Palant
2017/04/12 13:37:57
Are you certain? I am not aware of Firefox exposin
Manish Jethani
2017/04/12 14:27:01
My bad, it is implemented but it takes a callback
| |
52 return {selectors, trace, inject: true}; | |
53 | |
54 return new Promise(resolve => | |
55 { | |
56 hideElements(sender.page.id, sender.frame.id, selectors, error => | |
57 { | |
58 if (error && /\bError processing cssOrigin\b/.test(error.message) != -1) | |
59 tryInsertCSS = false; | |
60 | |
61 let response = {trace, inject: !!error}; | |
62 | |
63 if (trace || error) | |
64 response.selectors = selectors; | |
65 | |
66 resolve(response); | |
67 }); | |
68 }); | |
69 }); | |
70 | |
71 port.on("hide-elements", (msg, sender) => | |
Sebastian Noack
2017/04/12 12:21:18
This is out of scope of what is defined in the iss
Wladimir Palant
2017/04/12 12:25:56
Yes, this is an aspect we missed when describing t
Sebastian Noack
2017/04/12 12:54:43
Keep, in mind that with -abp-selector/:has there w
| |
72 { | |
73 return new Promise(resolve => | |
74 { | |
75 hideElements(sender.page.id, sender.frame.id, msg.selectors, error => | |
76 { | |
77 resolve({success: !error}); | |
78 }); | |
79 }); | |
49 }); | 80 }); |
50 | 81 |
51 port.on("forward", (msg, sender) => | 82 port.on("forward", (msg, sender) => |
52 { | 83 { |
53 let targetPage; | 84 let targetPage; |
54 if (msg.targetPageId) | 85 if (msg.targetPageId) |
55 targetPage = ext.getPage(msg.targetPageId); | 86 targetPage = ext.getPage(msg.targetPageId); |
56 else | 87 else |
57 targetPage = sender.page; | 88 targetPage = sender.page; |
58 | 89 |
59 if (targetPage) | 90 if (targetPage) |
60 { | 91 { |
61 msg.payload.sender = sender.page.id; | 92 msg.payload.sender = sender.page.id; |
62 if (msg.expectsResponse) | 93 if (msg.expectsResponse) |
63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); | 94 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); |
64 targetPage.sendMessage(msg.payload); | 95 targetPage.sendMessage(msg.payload); |
65 } | 96 } |
66 }); | 97 }); |
OLD | NEW |