Issue 4864 - Start using ESLint for adblockpluschrome

lib/devtools.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const {RegExpFilter,
-       WhitelistFilter, ElemHideFilter} = require("filterClasses");
+       WhitelistFilter,
+       ElemHideFilter,
+       ElemHideEmulationFilter} = require("filterClasses");
+
 const {SpecialSubscription} = require("subscriptionClasses");
 const {FilterStorage} = require("filterStorage");
 const {defaultMatcher} = require("matcher");
 const {FilterNotifier} = require("filterNotifier");
 const {extractHostFromFrame} = require("url");
 const {port} = require("messaging");
 
 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE", "GENERICBLOCK", "GENERICHIDE"];
 
 // Mapping of inspected tabs to their devpanel page
@@ skipping 42 matching lines @@
 }
 
 function hasRecord(panel, request, filter)
 {
   return panel.records.some(record =>
     record.request.url == request.url &&
     record.request.docDomain == request.docDomain &&
 
     // Ignore partial (e.g. ELEMHIDE) whitelisting if there is already
     // a DOCUMENT exception which disables all means of blocking.
-    (record.request.type == "DOCUMENT"
-     ? nonRequestTypes.indexOf(request.type) != -1
-     : record.request.type == request.type) &&
+    (record.request.type == "DOCUMENT" ?
+       nonRequestTypes.includes(request.type) :
+       record.request.type == request.type) &&
 
     // Matched element hiding filters don't relate to a particular request,
-    // so we also have to match the CSS selector in order to distinguish them.
+    // so we have to compare the selector in order to avoid duplicates.
     (record.filter && record.filter.selector) == (filter && filter.selector)
   );
 }
 
 function addRecord(panel, request, filter)
 {
   if (!hasRecord(panel, request, filter))
   {
     panel.port.postMessage({
       type: "add-record",
@@ skipping 31 matching lines @@
  * @param {?BlockingFilter} filter The matched filter or null if there is no
  *                                 match
  */
 exports.logRequest = function(page, url, type, docDomain,
                               thirdParty, sitekey,
                               specificOnly, filter)
 {
   let panel = getActivePanel(page);
   if (panel)
   {
-    addRecord(panel, {url, type, docDomain, thirdParty, sitekey, specificOnly},
-              filter);
+    let request = {url, type, docDomain, thirdParty, sitekey, specificOnly};
+    addRecord(panel, request, filter);
   }
 };
 
 /**
  * Logs active element hiding filters to the devtools panel.
  *
  * @param {Page}     page       The page the elements were hidden on
  * @param {string[]} selectors  The CSS selectors of active elemhide filters
  * @param {string}   docDomain  The IDN-decoded hostname of the document
  */
 function logHiddenElements(page, selectors, docDomain)
 {
   let panel = getActivePanel(page);
   if (panel)
   {
     for (let subscription of FilterStorage.subscriptions)
     {
       if (subscription.disabled)
         continue;
 
       for (let filter of subscription.filters)
       {
-        if (!(filter instanceof ElemHideFilter))
+        if (!(filter instanceof ElemHideFilter) &&
+            !(filter instanceof ElemHideEmulationFilter))
           continue;
         if (selectors.indexOf(filter.selector) == -1)
           continue;
         if (!filter.isActiveOnDomain(docDomain))
           continue;
 
         addRecord(panel, {type: "ELEMHIDE", docDomain}, filter);
       }
     }
   }
@@ skipping 197 matching lines @@
   panels[inspectedTabId] = {port: newPort, records: []};
 });
 
 port.on("devtools.traceElemHide", (message, sender) =>
 {
   logHiddenElements(
     sender.page, message.selectors,
     extractHostFromFrame(sender.frame)
   );
 });