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