Issue 7303 - Deprecate the use of String.prototype.substr()

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Definition of Filter class and its subclasses.
  */
 
 const {extend} = require("./coreUtils");
 const {filterToRegExp} = require("./common");
-const {normalizeHostname, suffixes} = require("./domain");
+const {normalizeHostname, domainSuffixes} = require("./url");
 const {filterNotifier} = require("./filterNotifier");
 
 const resources = require("../data/resources.json");
 
 /**
  * Map of internal resources for URL rewriting.
  * @type {Map.<string,string>}
  */
 let resourceMap = new Map(
   Object.keys(resources).map(key => [key, resources[key]])
@@ skipping 562 matching lines @@
 
     // If no domains are set the rule matches everywhere
     if (!domains)
       return true;
 
     // If the document has no host name, match only if the filter
     // isn't restricted to specific domains
     if (!docDomain)
       return domains.get("");
 
-    for (docDomain of suffixes(normalizeHostname(docDomain)))
+    for (docDomain of domainSuffixes(normalizeHostname(docDomain)))
     {
       let isDomainIncluded = domains.get(docDomain);
       if (typeof isDomainIncluded != "undefined")
         return isDomainIncluded;
     }
 
     return domains.get("");
   },
 
   /**
@@ skipping 285 matching lines @@
 
     if (!this.matchCase)
       location = lowerCaseLocation || location.toLowerCase();
 
     let {pattern} = this;
 
     let startsWithDoubleAnchor = pattern[0] == "|" && pattern[1] == "|";
     let endsWithSeparator = pattern[pattern.length - 1] == "^";
 
     if (startsWithDoubleAnchor)
-      pattern = pattern.substring(2);
+      pattern = pattern.substr(2);
 
     if (endsWithSeparator)
       pattern = pattern.slice(0, -1);
 
     let index = location.indexOf(pattern);
 
     // The "||" prefix requires that the text that follows does not start
     // with a forward slash.
     return index != -1 &&
            (!startsWithDoubleAnchor || location[index] != "/" &&
@@ skipping 511 matching lines @@
 
   /**
    * Script that should be executed
    * @type {string}
    */
   get script()
   {
     return this.body;
   }
 });