Issue 4054 - Remove filters from filtersByDomain

lib/elemHide.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
@@ skipping 139 matching lines @@
       let key;
       do {
         key = Math.random().toFixed(15).substr(5);
       } while (key in filterByKey);
 
       filterByKey[key] = filter;
       keyByFilter[filter.text] = key;
 
       if (usingFiltersByDomain)
       {
-        let domainMatches = filter.domains || defaultDomains;
-        for (let domain in domainMatches)
+        let domains = filter.domains || defaultDomains;
+        for (let domain in domains)
         {
           let filters = filtersByDomain[domain];
           if (!filters)
             filters = filtersByDomain[domain] = Object.create(null);
 
-          if (domainMatches[domain])
+          if (domains[domain])
             filters[filter.text] = filter;
           else
             filters[filter.text] = false;
         }
       }
 
       ElemHide.isDirty = true;
     }
   },
 
@@ skipping 19 matching lines @@
       if (!(filter.text in keyByFilter))
         return;
 
       let key = keyByFilter[filter.text];
       delete filterByKey[key];
       delete keyByFilter[filter.text];
       ElemHide.isDirty = true;
 
       if (usingFiltersByDomain)
       {
-        let domains = Object.keys(filter.domains || defaultDomains);
-        for (let domain of domains)

[Wladimir Palant, 2016/05/20 13:12:34]

So how about making this code consistent to the one in add()?

  let domainMatches = filter.domains || defaultDomains;
  for (let domain in domainMatches)

[kzar, 2016/05/20 13:14:25]

Done.

+        let domains = filter.domains || defaultDomains;
+        for (let domain in domains)
         {
           let filters = filtersByDomain[domain];
           if (filters)
             delete filters[filter.text];
         }
       }
     }
   },
 
   /**
@@ skipping 232 matching lines @@
       if (currentDomain == "")
         break;
 
       let nextDot = currentDomain.indexOf(".");
       currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1);
     }
 
     return selectors;
   }
 };