From 0cf53f81813caf938caf4bc2796e08da7b564831 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Thu, 6 Oct 2011 07:22:39 -0400 Subject: [PATCH] XUL cache prevents DOMContentLoaded. Grr. Closes issue #649. --- common/modules/overlay.jsm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm index cceb3905..1648bee4 100644 --- a/common/modules/overlay.jsm +++ b/common/modules/overlay.jsm @@ -131,12 +131,16 @@ var Overlay = Module("Overlay", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReferen observers: { "toplevel-window-ready": function (window, data) { - window.addEventListener("DOMContentLoaded", util.wrapCallback(function listener(event) { + let listener = util.wrapCallback(function listener(event) { if (event.originalTarget === window.document) { window.removeEventListener("DOMContentLoaded", listener.wrapper, true); + window.removeEventListener("load", listener.wrapper, true); overlay._loadOverlays(window); } - }), true); + }); + + window.addEventListener("DOMContentLoaded", listener, true); + window.addEventListener("load", listener, true); }, "chrome-document-global-created": function (window, uri) { this.observe(window, "toplevel-window-ready", null); }, "content-document-global-created": function (window, uri) { this.observe(window, "toplevel-window-ready", null); },