Issue 2161 - Add an option for disabling element hiding filters

lib/elemHide.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 65 matching lines @@
    */
   applied: false,
 
   /**
    * Called on module startup.
    */
   init: function()
   {
     Prefs.addListener(function(name)
     {
-      if (name == "enabled")
+      if (name == "enabled" || name == "element_hiding_enabled")
         ElemHide.apply();
     });
     onShutdown.add(function()
     {
       ElemHide.unapply();
     });
 
     let styleFile = IO.resolveFilePath(Prefs.data_directory);
     styleFile.append("elemhide.css");
     styleURL = Services.io.newFileURI(styleFile).QueryInterface(Ci.nsIFileURL);
@@ skipping 11 matching lines @@
     ElemHide.isDirty = false;
     ElemHide.unapply();
   },
 
   /**
    * Add a new element hiding filter
    * @param {ElemHideFilter} filter
    */
   add: function(filter)
   {
+    if (!Prefs.element_hiding_enabled)
+      return;
+
     if (filter instanceof ElemHideException)
     {
       if (filter.text in knownExceptions)
         return;
 
       let selector = filter.selector;
       if (!(selector in exceptions))
         exceptions[selector] = [];
       exceptions[selector].push(filter);
       knownExceptions[filter.text] = true;
@@ skipping 77 matching lines @@
    * Generates stylesheet URL and applies it globally
    */
   apply: function()
   {
     if (this._applying)
     {
       this._needsApply = true;
       return;
     }
 
-    if (!ElemHide.isDirty || !Prefs.enabled)
+    let enabled = Prefs.enabled && Prefs.element_hiding_enabled;
+
+    if (!ElemHide.isDirty || !enabled)
     {
       // Nothing changed, looks like we merely got enabled/disabled
-      if (Prefs.enabled && !ElemHide.applied)
+      if (enabled && !ElemHide.applied)
       {
         try
         {
           Utils.styleService.loadAndRegisterSheet(styleURL, Ci.nsIStyleSheetService.USER_SHEET);
           ElemHide.applied = true;
         }
         catch (e)
         {
           Cu.reportError(e);
         }
       }
-      else if (!Prefs.enabled && ElemHide.applied)
+      else if (!enabled && ElemHide.applied)
       {
         ElemHide.unapply();
       }
 
       return;
     }
 
     IO.writeToFile(styleURL.file, this._generateCSSContent(), function(e)
     {
       this._applying = false;
@@ skipping 143 matching lines @@
       let filter = filterByKey[key];
       if (specificOnly && (!filter.domains || filter.domains[""]))
         continue;
 
       if (filter.isActiveOnDomain(domain) && !this.getException(filter, domain))
         result.push(filter.selector);
     }
     return result;
   }
 };