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 460 matching lines @@
     docDomain = docDomain.toUpperCase();
 
     for (let domain in this.domains)
       if (this.domains[domain] && domain != docDomain && (domain.length <= docDomain.length || domain.indexOf("." + docDomain) != domain.length - docDomain.length - 1))
         return false;
 
     return true;
   },
 
   /**
+   * Checks whether this filter is generic or specific
+   * @return {Boolean} true if filter is generic, otherwise false
+   */
+  isGeneric: function() /**Boolean*/

[Thomas Greiner, 2015/08/28 10:28:24]

Detail: Documentation is great but please avoid duplication.

[kzar, 2015/09/03 12:37:02]

I'm not sure where the duplication is here, but I'm open to suggestions if
there's something that you'd like to change.

[Thomas Greiner, 2015/09/21 16:53:36]

The duplication I meant is that you specify the return type both in the comment
block above as well as inline on this line.

[kzar, 2015/09/22 13:16:47]

I see, Done.

+  {
+    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);
       if (this._disabled)
         buffer.push("disabled=true");
       if (this._hitCount)
@@ skipping 256 matching lines @@
   PING: 1,
   XMLHTTPREQUEST: 2048,
   OBJECT_SUBREQUEST: 4096,
   DTD: 1,
   MEDIA: 16384,
   FONT: 32768,
 
   BACKGROUND: 4,    // Backwards compat, same as IMAGE
 
   POPUP: 0x10000000,
-  ELEMHIDE: 0x40000000
+  GENERICBLOCK: 0x20000000,
+  ELEMHIDE: 0x40000000,
+  GENERICHIDE: 0x80000000
 };
 
-// DOCUMENT, ELEMHIDE, POPUP options shouldn't be there by default
-RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE | RegExpFilter.typeMap.POPUP);
+// DOCUMENT, ELEMHIDE, POPUP, GENERICHIDE and GENERICBLOCK options shouldn't
+// be there by default
+RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.DOCUMENT |
+                                        RegExpFilter.typeMap.ELEMHIDE |
+                                        RegExpFilter.typeMap.POPUP |
+                                        RegExpFilter.typeMap.GENERICHIDE |
+                                        RegExpFilter.typeMap.GENERICBLOCK);
 
 /**
  * Class for blocking filters
  * @param {String} text see Filter()
  * @param {String} regexpSource see RegExpFilter()
  * @param {Number} contentType see RegExpFilter()
  * @param {Boolean} matchCase see RegExpFilter()
  * @param {String} domains see RegExpFilter()
  * @param {Boolean} thirdParty see RegExpFilter()
  * @param {String} sitekeys see RegExpFilter()
@@ skipping 249 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;
   }
 };