Issue 2264 - Remove deprecated logic from Utils.runAsync() on Chrome/Opera/Safari

lib/utils.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
  * 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/>.
  */
 
-let runAsyncQueue;
-
 var Utils = exports.Utils = {
   systemPrincipal: null,
   getString: function(id)
   {
     if (typeof ext !== "undefined" && "i18n" in ext)
       return ext.i18n.getMessage("global_" + id);
     else
       return id;
   },
-
-  // This function can take additional parameters. Second paramater will be
-  // passed as this variable to the callback and any additional parameters as
-  // callback parameters.
   runAsync: function(callback)
   {
-    callback = callback.bind.apply(callback, Array.prototype.slice.call(arguments, 1));
-
-    if (typeof runAsyncQueue == "undefined")
+    if (document.readyState == "loading")
     {
-      runAsyncQueue = (document.readyState == "loading" ? [] : null);
-      if (runAsyncQueue)
+      // Make sure to not run asynchronous actions before all
+      // scripts loaded. This caused issues on Opera in the past.
+      let onDOMContentLoaded = function()
       {
-        // Hack: Opera will happily run asynchronous actions while scripts are
-        // loading, queue them until the document is ready.
-        let loadHandler = function()
-        {
-          document.removeEventListener("DOMContentLoaded", loadHandler, false);
-
-          let queue = runAsyncQueue;
-          runAsyncQueue = null;
-          for (let callback of queue)
-          {
-            try
-            {
-              callback();
-            }
-            catch(e)
-            {
-              Cu.reportError(e);
-            }
-          }
-        };
-        document.addEventListener("DOMContentLoaded", loadHandler, false);
-      }
+        document.removeEventListener("DOMContentLoaded", onDOMContentLoaded);
+        callback();
+      };
+      document.addEventListener("DOMContentLoaded", onDOMContentLoaded);
     }
-
-    if (runAsyncQueue)
-      runAsyncQueue.push(callback);
     else
-      window.setTimeout(callback, 0);
+    {
+      setTimeout(callback, 0);
+    }
   },
   get appLocale()
   {
     var locale = ext.i18n.getMessage("@@ui_locale").replace(/_/g, "-");
     Object.defineProperty(this, "appLocale", {value: locale, enumerable: true});
     return this.appLocale;
   },
   generateChecksum: function(lines)
   {
     // We cannot calculate MD5 checksums yet :-(
@@ skipping 60 matching lines @@
   {
     var Prefs = require("prefs").Prefs;
     var docLink = Prefs.documentation_link;
     return docLink.replace(/%LINK%/g, linkID).replace(/%LANG%/g, Utils.appLocale);
   },
 
   yield: function()
   {
   }
 };