Ported changes from Adblock Plus integration back into URL Fixer

lib/typoNetError.js

 /*
  * This file is part of the URL Fixer,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * URL Fixer 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.
  *
  * URL Fixer 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 URL Fixer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 let {Prefs} = require("prefs");
+let {WindowObserver} = require("windowObserver");
 let appIntegration = require("typoAppIntegration");
 let {onWhitelistEntryRemoved} = require("typoRules");
 let {processUserCorrection} = require("typoCollector");
 
 // Load HTML code to add to network error pages
 let netErrorOverlay = null;
 let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
 request.open("GET", "chrome://" + require("info").addonName + "/content/netError.xhtml");
 request.addEventListener("load", function(event)
 {
   netErrorOverlay = event.target.responseXML;
+  
+  new WindowObserver({
+    applyToWindow: function(window)
+    {
+      if (!appIntegration.isKnownWindow(window))
+        return;
+      
+      let browser = appIntegration.getBrowser(window);
+      if (browser)
+        browser.addEventListener("DOMContentLoaded", handlePageLoad, false);
+    },
+
+    removeFromWindow: function(window)
+    {
+      if (!appIntegration.isKnownWindow(window))
+        return;
+      
+      let browser = appIntegration.getBrowser(window);
+      if (browser)
+      {
+        browser.removeEventListener("DOMContentLoaded", handlePageLoad, false);
+        if (browser.browsers)
+        {
+          for (let i = 0; i < browser.browsers.length; i++)
+          {
+            let contentWnd = browser.browsers[i].contentWindow;
+            if (contentWnd.document.documentURI.indexOf("about:neterror?") == 0)
+              removeFromNetErrorPage(contentWnd);
+          }
+        }
+      }
+    }
+  });
 }, false);
 request.send(null);
-
-exports.applyToWindow = applyToWindow;

[Wladimir Palant, 2012/12/13 16:07:00]

How about netError uses its own WindowObserver so it doesn't depend on typoFixer
to call it? This observer can be initialized along with netErrorOverlay to make
sure nothing happens before it is loaded.

[Thomas Greiner, 2013/01/14 10:06:41]

Done.

-function applyToWindow(window)
-{
-  let browser = appIntegration.getBrowser(window);
-  if (browser)
-    browser.addEventListener("DOMContentLoaded", handlePageLoad, false);
-}
-
-exports.removeFromWindow = removeFromWindow;
-function removeFromWindow(window)
-{
-  let browser = appIntegration.getBrowser(window);
-  if (browser)
-  {
-    browser.removeEventListener("DOMContentLoaded", handlePageLoad, false);
-    if (browser.browsers)
-    {
-      for (let i = 0; i < browser.browsers.length; i++)
-      {
-        let contentWnd = browser.browsers[i].contentWindow;
-        if (contentWnd.document.documentURI.indexOf("about:neterror?") == 0)
-          removeFromNetErrorPage(contentWnd);
-      }
-    }
-  }
-}
 
 function handlePageLoad(event)
 {
   let document = event.target;
   if (document.documentURI.indexOf("about:neterror?") != 0 ||
       document.documentURI.indexOf("e=netOffline") > 0 ||
       document.documentURI.indexOf("e=notCached") > 0)
   {
     return;
   }
@@ skipping 53 matching lines @@
     overlay.parentNode.removeChild(overlay);
 }
 
 function parseURL(url)
 {
   if (/^\s*((?:\w+:)?\/*(?:[^\/#]*@)?)([^\/:#]*)/.test(url))
     return [RegExp.$1, RegExp.$2.toLowerCase(), RegExp.rightContext];
   else
     return [url, null, null];
 }