adblockplusopera: Fix loading race condition

lib/adblockplus_compat.js

 /*
  * This file is part of the Adblock Plus extension,
  * Copyright (C) 2006-2012 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 129 matching lines @@
 
     lineBreak: "\n",
 
     resolveFilePath: function(path)
     {
       return new FakeFile(path);
     },
 
     readFromFile: function(file, decode, listener, callback, timeLineID)
     {
-      // Fake asynchronous execution
-      setTimeout(function()
+      var Utils = require("utils").Utils;
+      Utils.runAsync(function()
       {
         if ("spec" in file && /^defaults\b/.test(file.spec))
         {
           // Code attempts to read the default patterns.ini, we don't have that.
           // Make sure to execute first-run actions instead.
           callback(null);
           if (localStorage.currentVersion)
             seenDataCorruption = true;
           delete localStorage.currentVersion;
           return;
         }
 
         var path = this._getFilePath(file);
         if (!(path in window.localStorage))
         {
           callback(new Error("File doesn't exist"))
           return;
         }
 
         var lines = window.localStorage[path].split(/[\r\n]+/);
         for (var i = 0; i < lines.length; i++)
           listener.process(lines[i]);
         listener.process(null);
         callback(null);
-      }.bind(this), 0);
+      }.bind(this));
     },
 
     writeToFile: function(file, encode, data, callback, timeLineID)
     {
       var path = this._getFilePath(file);
       this._setFileContents(path, data.join(this.lineBreak) + this.lineBreak, Date.now());
 
       // Fake asynchronous execution
       setTimeout(callback.bind(null, null), 0);
     },
@@ skipping 114 matching lines @@
 {
   Utils: {
     systemPrincipal: null,
     getString: function(id)
     {
       return id;
     },
     runAsync: function(callback, thisPtr)
     {
       var params = Array.prototype.slice.call(arguments, 2);
-      window.setTimeout(function()
+
+      function invokeCallback()
       {
         callback.apply(thisPtr, params);
-      }, 0);
+      }
+
+      if (document.readyState === "complete")
+        window.setTimeout(invokeCallback);

[Wladimir Palant, 2012/11/21 15:47:58]

setTimeout(..., 0)?

[Felix Dahlke, 2012/11/21 15:56:56]

You're right. This only worked because the readyState is never "complete" at
this point (at least for me).

+      else
+        window.addEventListener("load", invokeCallback);
     },
     get appLocale()
     {
       // Note: navigator.language
       return window.navigator.browserLanguage;
     },
     generateChecksum: function(lines)
     {
       // We cannot calculate MD5 checksums yet :-(
       return null;
@@ skipping 180 matching lines @@
   status: -1,
   notificationCallbacks: {},
   loadFlags: 0,
   INHIBIT_CACHING: 0,
   VALIDATE_ALWAYS: 0,
   QueryInterface: function()
   {
     return this;
   }
 };