[adblockpluscore] Issue 4911 - Merge ElemHideEmulation.load/apply into one function

chrome/content/elemHideEmulation.js

 var propertySelectorRegExp = /\[\-abp\-properties=(["'])([^"']+)\1\]/;
 
 function splitSelector(selector)
 {
   if (selector.indexOf(",") == -1)
     return [selector];
 
   var selectors = [];
   var start = 0;
   var level = 0;
@@ skipping 103 matching lines @@
     this.addSelectorsFunc(selectors, filters);
   },
 
   onLoad: function(event)
   {
     var stylesheet = event.target.sheet;
     if (stylesheet)
       this.addSelectors([stylesheet]);
   },
 
-  load: function(callback)
+  apply: function(callback)

[Sebastian Noack, 2017/02/18 11:28:13]

The callback parameter is unused now.

[wspee, 2017/02/18 12:49:50]

Done.

   {
     this.getFiltersFunc(function(patterns)
     {
       this.patterns = [];
       for (var i = 0; i < patterns.length; i++)
       {
         var pattern = patterns[i];
         var match = propertySelectorRegExp.exec(pattern.selector);
         if (!match)
           continue;
 
         var propertyExpression = match[2];
         var regexpString;
         if (propertyExpression.length >= 2 && propertyExpression[0] == "/" &&
             propertyExpression[propertyExpression.length - 1] == "/")
           regexpString = propertyExpression.slice(1, -1)
               .replace("\\x7B ", "{").replace("\\x7D ", "}");
         else
           regexpString = filterToRegExp(propertyExpression);
 
         this.patterns.push({
           text: pattern.text,
           regexp: new RegExp(regexpString, "i"),
           prefix: pattern.selector.substr(0, match.index),
           suffix: pattern.selector.substr(match.index + match[0].length)
         });
       }
 
-      callback();
+      if (this.patterns.length > 0)
+      {
+        var document = this.window.document;
+        this.addSelectors(document.styleSheets);
+        document.addEventListener("load", this.onLoad.bind(this), true);
+      }
     }.bind(this));
-  },
-
-  apply: function()
-  {
-    if (this.patterns.length > 0)
-    {
-      var document = this.window.document;
-      this.addSelectors(document.styleSheets);
-      document.addEventListener("load", this.onLoad.bind(this), true);
-    }
   }
 };