Issue 616 - Add $generichide + $genericblock filter options and enforce them.

lib/filterClasses.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 464 matching lines @@
         return false;
 
     return true;
   },
 
   /**
    * Checks whether this filter is generic or specific
    */
   isGeneric: function() /**Boolean*/
   {
-    return (!(this.sitekeys && this.sitekeys.length) &&

[Felix Dahlke, 2015/09/28 08:28:45]

Nit: Superfluous parentheses around the expression.

[kzar, 2015/09/28 10:16:12]

Done.

-            (!this.domains || this.domains[""]));
+    return !(this.sitekeys && this.sitekeys.length) &&
+            (!this.domains || this.domains[""]);
   },
 
   /**
    * See Filter.serialize()
    */
   serialize: function(buffer)
   {
     if (this._disabled || this._hitCount || this._lastHit)
     {
       Filter.prototype.serialize.call(this, buffer);
@@ skipping 540 matching lines @@
     // several times on Safari, due to WebKit bug 132872
     let prop = Object.getOwnPropertyDescriptor(this, "regexpString");
     if (prop)
       return prop.value;
 
     let regexp = Filter.toRegExp(this.regexpSource);
     Object.defineProperty(this, "regexpString", {value: regexp});
     return regexp;
   }
 };