[Pkg-mozext-commits] [greasemonkey] 18/43: Remove double-import workaround.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit 72148460d2684d2cebb93c0b3d99d476c870d64a
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Wed Nov 5 11:13:14 2014 -0500

    Remove double-import workaround.
---
 content/framescript.js     | 28 ++++++++++------------------
 modules/contentObserver.js | 10 ----------
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/content/framescript.js b/content/framescript.js
index de956fe..059ed0a 100644
--- a/content/framescript.js
+++ b/content/framescript.js
@@ -5,24 +5,16 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 
-(function() {
-// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ //
-
-// For every frame/process, make sure the content observer is running.
-
+// For every *content* frame/process, make sure the content observer is running.
 var rti = docShell.QueryInterface(Ci.nsIDocShellTreeItem).rootTreeItem;
-if (rti.itemType != Ci.nsIDocShellTreeItem.typeContent)
-  return;
-
-Cu.import('resource://greasemonkey/contentObserver.js');
-
-// \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ // \\ //
+if (rti.itemType == Ci.nsIDocShellTreeItem.typeContent) {
+  Cu.import('resource://greasemonkey/contentObserver.js');
 
-addEventListener("pagehide", contentObserver.pagehide.bind(contentObserver));
-addEventListener("pageshow", contentObserver.pageshow.bind(contentObserver));
+  addEventListener("pagehide", contentObserver.pagehide.bind(contentObserver));
+  addEventListener("pageshow", contentObserver.pageshow.bind(contentObserver));
 
-addMessageListener("greasemonkey:inject-script",
-    contentObserver.runDelayedScript.bind(contentObserver));
-addMessageListener("greasemonkey:menu-command-clicked",
-    contentObserver.runMenuCommand.bind(contentObserver));
-})();
+  addMessageListener("greasemonkey:inject-script",
+      contentObserver.runDelayedScript.bind(contentObserver));
+  addMessageListener("greasemonkey:menu-command-clicked",
+      contentObserver.runMenuCommand.bind(contentObserver));
+}
diff --git a/modules/contentObserver.js b/modules/contentObserver.js
index c65a4ca..8cbfc48 100644
--- a/modules/contentObserver.js
+++ b/modules/contentObserver.js
@@ -131,16 +131,6 @@ ContentObserver.prototype.observe = function(aSubject, aTopic, aData) {
       var win = doc && doc.defaultView;
       if (!doc || !win) break;
 
-      // Work around double-import bug.  This module seems to get imported
-      // twice, though we'd expect once.  One observes broken events, the other
-      // works.
-      try {
-        GM_util.messageManagerForWin(win);
-      } catch (e) {
-        dump('ignoring observe of win with no contentFrameMessageManager\n');
-        return;
-      }
-
       // Listen for whichever kind of load event arrives first.
       win.addEventListener("DOMContentLoaded", gContentLoad, true);
       win.addEventListener("load", gContentLoad, true);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git