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

Side by Side Diff: lib/elemHideHelper.js

Issue 29410607: Issue 5090 - Use user stylesheets for element hiding if possible (Closed)
Patch Set: Move get-selectors and hide-elements to elemHideHelper Created May 1, 2017, 11:04 p.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 | « include.preload.js ('k') | metadata.chrome » ('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-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 /** @module elemHideHelper */
19
18 "use strict"; 20 "use strict";
19 21
20 const {RegExpFilter} = require("filterClasses"); 22 const {RegExpFilter} = require("filterClasses");
21 const {ElemHide} = require("elemHide"); 23 const {ElemHide} = require("elemHide");
22 const {checkWhitelisted} = require("whitelisting"); 24 const {checkWhitelisted} = require("whitelisting");
23 const {extractHostFromFrame} = require("url"); 25 const {extractHostFromFrame} = require("url");
24 const {port} = require("messaging"); 26 const {port} = require("messaging");
25 const devtools = require("devtools"); 27 const devtools = require("devtools");
28 const info = require("info");
29
30 let userStylesheetsSupported = info.platform == "gecko" &&
31 info.platformVersion.split(".")[0] >= 53;
32
33 function hideElements(tabId, frameId, selectors, callback)
34 {
35 let code = selectors.join(", ") + "{display: none !important;}";
36
37 chrome.tabs.insertCSS(tabId,
38 {
39 code,
40 cssOrigin: "user",
41 frameId,
42 matchAboutBlank: true
43 },
44 () =>
45 {
46 callback(chrome.runtime.lastError);
47 }
48 );
49 }
26 50
27 port.on("get-selectors", (msg, sender) => 51 port.on("get-selectors", (msg, sender) =>
28 { 52 {
29 let selectors; 53 let selectors;
30 let trace = devtools && devtools.hasPanel(sender.page); 54 let trace = devtools && devtools.hasPanel(sender.page);
31 55
32 if (!checkWhitelisted(sender.page, sender.frame, 56 if (!checkWhitelisted(sender.page, sender.frame,
33 RegExpFilter.typeMap.DOCUMENT | 57 RegExpFilter.typeMap.DOCUMENT |
34 RegExpFilter.typeMap.ELEMHIDE)) 58 RegExpFilter.typeMap.ELEMHIDE))
35 { 59 {
36 let specificOnly = checkWhitelisted(sender.page, sender.frame, 60 let specificOnly = checkWhitelisted(sender.page, sender.frame,
37 RegExpFilter.typeMap.GENERICHIDE); 61 RegExpFilter.typeMap.GENERICHIDE);
38 selectors = ElemHide.getSelectorsForDomain( 62 selectors = ElemHide.getSelectorsForDomain(
39 extractHostFromFrame(sender.frame), 63 extractHostFromFrame(sender.frame),
40 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING 64 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING
41 ); 65 );
42 } 66 }
43 else 67 else
44 { 68 {
45 selectors = []; 69 selectors = [];
46 } 70 }
47 71
48 return {selectors, trace}; 72 if (!userStylesheetsSupported)
73 return {selectors, trace, inject: true};
74
75 if (selectors.length == 0)
76 {
77 if (trace)
78 return {selectors, trace, inject: false};
79
80 return {trace, inject: false};
81 }
82
83 return new Promise(resolve =>
84 {
85 hideElements(sender.page.id, sender.frame.id, selectors, error =>
86 {
87 let response = {trace, inject: !!error};
88
89 if (trace || error)
90 response.selectors = selectors;
91
92 resolve(response);
93 });
94 });
49 }); 95 });
50 96
51 port.on("forward", (msg, sender) => 97 port.on("hide-elements", (msg, sender) =>
52 { 98 {
53 let targetPage; 99 if (!msg.selectors || msg.selectors.length == 0)
54 if (msg.targetPageId) 100 return {success: true};
55 targetPage = ext.getPage(msg.targetPageId);
56 else
57 targetPage = sender.page;
58 101
59 if (targetPage) 102 return new Promise(resolve =>
60 { 103 {
61 msg.payload.sender = sender.page.id; 104 hideElements(sender.page.id, sender.frame.id, msg.selectors, error =>
62 if (msg.expectsResponse) 105 {
63 return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload)); 106 resolve({success: !error});
64 targetPage.sendMessage(msg.payload); 107 });
65 } 108 });
66 }); 109 });
OLDNEW
« no previous file with comments | « include.preload.js ('k') | metadata.chrome » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld