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 "use strict"; | 18 "use strict"; |
19 | 19 |
20 let {RegExpFilter, WhitelistFilter, ElemHideFilter} = require("filterClasses"); | 20 let { |
| 21 RegExpFilter, |
| 22 WhitelistFilter, |
| 23 ElemHideFilter, |
| 24 ElemHideEmulationFilter |
| 25 } = require("filterClasses"); |
| 26 |
21 let {SpecialSubscription} = require("subscriptionClasses"); | 27 let {SpecialSubscription} = require("subscriptionClasses"); |
22 let {FilterStorage} = require("filterStorage"); | 28 let {FilterStorage} = require("filterStorage"); |
23 let {defaultMatcher} = require("matcher"); | 29 let {defaultMatcher} = require("matcher"); |
24 let {FilterNotifier} = require("filterNotifier"); | 30 let {FilterNotifier} = require("filterNotifier"); |
25 let {extractHostFromFrame} = require("url"); | 31 let {extractHostFromFrame} = require("url"); |
26 let {port} = require("messaging"); | 32 let {port} = require("messaging"); |
27 | 33 |
28 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE", "GENERICBLOCK", "GENERICHIDE"]; | 34 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE", "GENERICBLOCK", "GENERICHIDE"]; |
29 | 35 |
30 // Mapping of inspected tabs to their devpanel page | 36 // Mapping of inspected tabs to their devpanel page |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 /** | 159 /** |
154 * Logs active element hiding filters to the devtools panel. | 160 * Logs active element hiding filters to the devtools panel. |
155 * | 161 * |
156 * @param {Page} page The page the elements were hidden on | 162 * @param {Page} page The page the elements were hidden on |
157 * @param {string[]} selectors The CSS selectors of active elemhide filters | 163 * @param {string[]} selectors The CSS selectors of active elemhide filters |
158 * @param {string} docDomain The IDN-decoded hostname of the document | 164 * @param {string} docDomain The IDN-decoded hostname of the document |
159 */ | 165 */ |
160 function logHiddenElements(page, selectors, docDomain) | 166 function logHiddenElements(page, selectors, docDomain) |
161 { | 167 { |
162 let panel = getActivePanel(page); | 168 let panel = getActivePanel(page); |
| 169 if (panel) |
163 { | 170 { |
164 for (let subscription of FilterStorage.subscriptions) | 171 for (let subscription of FilterStorage.subscriptions) |
165 { | 172 { |
166 if (subscription.disabled) | 173 if (subscription.disabled) |
167 continue; | 174 continue; |
168 | 175 |
169 for (let filter of subscription.filters) | 176 for (let filter of subscription.filters) |
170 { | 177 { |
171 if (!(filter instanceof ElemHideFilter)) | 178 if (!(filter instanceof ElemHideFilter) && |
| 179 !(filter instanceof ElemHideEmulationFilter)) |
172 continue; | 180 continue; |
173 if (selectors.indexOf(filter.selector) == -1) | 181 if (selectors.indexOf(filter.selector) == -1) |
174 continue; | 182 continue; |
175 if (!filter.isActiveOnDomain(docDomain)) | 183 if (!filter.isActiveOnDomain(docDomain)) |
176 continue; | 184 continue; |
177 | 185 |
178 addRecord(panel, {type: "ELEMHIDE", docDomain: docDomain}, filter); | 186 addRecord(panel, {type: "ELEMHIDE", docDomain: docDomain}, filter); |
179 } | 187 } |
180 } | 188 } |
181 } | 189 } |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 panels[inspectedTabId] = {port: port, records: []}; | 384 panels[inspectedTabId] = {port: port, records: []}; |
377 }); | 385 }); |
378 | 386 |
379 port.on("devtools.traceElemHide", (message, sender) => | 387 port.on("devtools.traceElemHide", (message, sender) => |
380 { | 388 { |
381 logHiddenElements( | 389 logHiddenElements( |
382 sender.page, message.selectors, | 390 sender.page, message.selectors, |
383 extractHostFromFrame(sender.frame) | 391 extractHostFromFrame(sender.frame) |
384 ); | 392 ); |
385 }); | 393 }); |
OLD | NEW |