Fixed #4 - Disable $rewrite option for all but internal redirect

lib/filterClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 607 matching lines @@
  *   letters
  * @param {string} [domains]
  *   Domains that the filter is restricted to, e.g. "foo.com|bar.com|~baz.com"
  * @param {boolean} [thirdParty]
  *   Defines whether the filter should apply to third-party or first-party
  *   content only
  * @param {string} [sitekeys]
  *   Public keys of websites that this filter should apply to
  * @param {?string} [rewrite]
  *   The name of the internal resource to which to rewrite the
- *   URL. e.g. if the value of the <code>rewrite</code> parameter is
+ *   URL. e.g. if the value of the <code>$rewrite</code> option is
  *   <code>abp-resource:blank-html</code>, this should be
  *   <code>blank-html</code>.
  * @constructor
  * @augments ActiveFilter
  */
 function RegExpFilter(text, regexpSource, contentType, matchCase, domains,
                       thirdParty, sitekeys, rewrite)
 {
   ActiveFilter.call(this, text, domains);
 
@@ skipping 56 matching lines @@
   /**
    * Regular expression to be used when testing against this filter
    * @type {RegExp}
    */
   get regexp()
   {
     let value = null;
 
     let {pattern} = this;
     if (!isLiteralPattern(pattern))
       value = new RegExp(filterToRegExp(pattern));

[hub, 2019/04/16 13:44:27]

There was a conflict here (removal of the last argument of new RegExp() netween
master and next)

[Manish Jethani, 2019/04/16 14:06:23]

Acknowledged.

 
     Object.defineProperty(this, "regexp", {value});
     return value;
   },
   /**
    * Content types the filter applies to, combination of values from
    * RegExpFilter.typeMap
    * @type {number}
    */
   contentType: 0x7FFFFFFF,
@@ skipping 237 matching lines @@
           case "sitekey":
             if (!value)
               return new InvalidFilter(origText, "filter_unknown_option");
             sitekeys = value.toUpperCase();
             break;
           case "rewrite":
             if (value == null)
               return new InvalidFilter(origText, "filter_unknown_option");
             if (!value.startsWith("abp-resource:"))
               return new InvalidFilter(origText, "filter_invalid_rewrite");
             rewrite = value.substring("abp-resource:".length);

[hub, 2019/04/16 13:44:27]

There was another conflict here. We changed from substr() to substring().

[Manish Jethani, 2019/04/16 14:06:23]

Acknowledged.

             break;
           default:
             return new InvalidFilter(origText, "filter_unknown_option");
         }
       }
     }
   }
 
   try
   {
@@ skipping 76 matching lines @@
  * Class for blocking filters
  * @param {string} text see {@link Filter Filter()}
  * @param {string} regexpSource see {@link RegExpFilter RegExpFilter()}
  * @param {number} [contentType] see {@link RegExpFilter RegExpFilter()}
  * @param {boolean} [matchCase] see {@link RegExpFilter RegExpFilter()}
  * @param {string} [domains] see {@link RegExpFilter RegExpFilter()}
  * @param {boolean} [thirdParty] see {@link RegExpFilter RegExpFilter()}
  * @param {string} [sitekeys] see {@link RegExpFilter RegExpFilter()}
  * @param {?string} [rewrite]
  *   The name of the internal resource to which to rewrite the
- *   URL. e.g. if the value of the <code>rewrite</code> parameter is

[Manish Jethani, 2019/04/16 13:54:06]

We forgot this in master but let's do it here: $rewrite option

[hub, 2019/04/16 14:08:39]

The function docs didn't get that fix. Doing both.

+ *   URL. e.g. if the value of the <code>$rewrite</code> option is
  *   <code>abp-resource:blank-html</code>, this should be
  *   <code>blank-html</code>.
  * @param {boolean} [collapse]
  *   defines whether the filter should collapse blocked content, can be null
  * @param {string} [csp]
  *   Content Security Policy to inject when the filter matches
  * @constructor
  * @augments RegExpFilter
  */
 function BlockingFilter(text, regexpSource, contentType, matchCase, domains,
@@ skipping 241 matching lines @@
 
   /**
    * Script that should be executed
    * @type {string}
    */
   get script()
   {
     return this.body;
   }
 });