Issue 6741 - Use ES2015 classes in lib/content/elemHideEmulation.js

lib/content/elemHideEmulation.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 251 matching lines @@
     yield [prefix + this._selector, subtree];
   }
 }
 
 const incompletePrefixRegexp = /[\s>+~]$/;
 
 class HasSelector
 {
   constructor(selectors)
   {
+    this.dependsOnDOM = true;
+
     this._innerSelectors = selectors;
-    this.dependsOnDOM = true;

[hub, 2018/08/20 19:51:21]

I'd feel better if the properties that have a default value were initialised
before anything else in the constructor.

[Manish Jethani, 2018/08/21 03:45:30]

OK, that makes sense.

Done.

   }
 
   get dependsOnStyles()
   {
     return this._innerSelectors.some(selector => selector.dependsOnStyles);
   }
 
   get dependsOnCharacterData()
   {
     return this._innerSelectors.some(
@@ skipping 54 matching lines @@
           testInfo.lastProcessedElements.add(element);
       }
     }
   }
 }
 
 class ContainsSelector
 {
   constructor(textContent)
   {
-    this._regexp = makeRegExpParameter(textContent);
     this.dependsOnDOM = true;
     this.dependsOnCharacterData = true;

[hub, 2018/08/20 19:51:21]

same here.

[Manish Jethani, 2018/08/21 03:45:30]

Done.

+
+    this._regexp = makeRegExpParameter(textContent);
   }
 
   *getSelectors(prefix, subtree, styles, targets)
   {
     for (let element of this.getElements(prefix, subtree, styles, targets))
       yield [makeSelector(element), subtree];
   }
 
   *getElements(prefix, subtree, styles, targets)
   {
@@ skipping 34 matching lines @@
           testInfo.lastProcessedElements.add(element);
       }
     }
   }
 }
 
 class PropsSelector
 {
   constructor(propertyExpression)
   {
+    this.dependsOnStyles = true;
+    this.dependsOnDOM = true;
+
     let regexpString;
     if (propertyExpression.length >= 2 && propertyExpression[0] == "/" &&
         propertyExpression[propertyExpression.length - 1] == "/")
     {
       regexpString = propertyExpression.slice(1, -1)
         .replace("\\7B ", "{").replace("\\7D ", "}");
     }
     else
       regexpString = filterToRegExp(propertyExpression);
 
     this._regexp = new RegExp(regexpString, "i");
-
-    this.dependsOnStyles = true;
-    this.dependsOnDOM = true;

[hub, 2018/08/20 19:51:21]

and here.

[Manish Jethani, 2018/08/21 03:45:30]

Done.

   }
 
   *findPropsSelectors(styles, prefix, regexp)
   {
     for (let style of styles)
       if (regexp.test(style.style))
         for (let subSelector of style.subSelectors)
         {
           if (subSelector.startsWith("*") &&
               !incompletePrefixRegexp.test(prefix))
@@ skipping 540 matching lines @@
           characterData: shouldObserveCharacterData(this.patterns),
           subtree: true
         }
       );
       this.document.addEventListener("load", this.onLoad.bind(this), true);
     }
   }
 }
 
 exports.ElemHideEmulation = ElemHideEmulation;