[Pkg-mozext-commits] [firebug] 10/24: Issue 5946: Firebug breaks Firefox UI when disabled

[David Prévot]

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

taffit pushed a commit to tag firebug-1.10.4
in repository firebug.

commit 122d1212c3461e4b407b0ee46a47a38f971e91cd
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Wed Oct 3 15:46:22 2012 +0200

    Issue 5946: 	Firebug breaks Firefox UI when disabled
---
 .../content/firebug/firefox/browserOverlay.js      | 77 +++++++++++++---------
 extension/modules/loader.js                        |  4 ++
 2 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
index cc6b047..b4c3d2b 100644
--- a/extension/content/firebug/firefox/browserOverlay.js
+++ b/extension/content/firebug/firefox/browserOverlay.js
@@ -557,6 +557,51 @@ Firebug.GlobalUI =
         });
 
         return true;
+    },
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // Page Context Menu Overlay
+
+    loadContextMenuOverlay: function(win)
+    {
+        if (typeof(win.nsContextMenu) == "undefined")
+            return;
+
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=433168
+        var setTargetOriginal = this.setTargetOriginal = win.nsContextMenu.prototype.setTarget;
+        win.nsContextMenu.prototype.setTarget = function(aNode, aRangeParent, aRangeOffset)
+        {
+            setTargetOriginal.apply(this, arguments);
+
+            if (this.isTargetAFormControl(aNode))
+                this.shouldDisplay = true;
+        };
+
+        // Hide built-in inspector if the pref says so.
+        var initItemsOriginal = this.initItemsOriginal = win.nsContextMenu.prototype.initItems;
+        win.nsContextMenu.prototype.initItems = function()
+        {
+            initItemsOriginal.apply(this, arguments);
+
+            // Hide built-in inspector menu item if the pref "extensions.firebug.hideDefaultInspector"
+            // says so. Note that there is also built-in preference "devtools.inspector.enable" that
+            // can be used for the same purpose.
+            var hideInspect = PrefLoader.getPref("hideDefaultInspector");
+            if (hideInspect)
+            {
+                this.showItem("inspect-separator", false);
+                this.showItem("context-inspect", false);
+            }
+        }
+    },
+
+    unloadContextMenuOverlay: function(win)
+    {
+        if (typeof(win.nsContextMenu) == "undefined")
+            return;
+
+        win.nsContextMenu.prototype.setTarget = this.setTargetOriginal;
+        win.nsContextMenu.prototype.initItems = this.initItemsOriginal;
     }
 }
 
@@ -1269,38 +1314,6 @@ if (checkFirebugVersion(PrefLoader.getPref("currentVersion")) > 0)
 }
 
 // ********************************************************************************************* //
-// Firefox Page Context Menu
-
-if (typeof(nsContextMenu) != "undefined")
-{
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=433168
-    var setTargetOriginal = nsContextMenu.prototype.setTarget;
-    nsContextMenu.prototype.setTarget = function(aNode, aRangeParent, aRangeOffset)
-    {
-        setTargetOriginal.apply(this, arguments);
-        if (this.isTargetAFormControl(aNode))
-            this.shouldDisplay = true;
-    };
-
-    // Hide built-in inspector if the pref says so.
-    var initItemsOriginal = nsContextMenu.prototype.initItems;
-    nsContextMenu.prototype.initItems = function()
-    {
-        initItemsOriginal.apply(this, arguments);
-
-        // Hide built-in inspector menu item if the pref "extensions.firebug.hideDefaultInspector"
-        // says so. Note that there is also built-in preference "devtools.inspector.enable" that
-        // can be used for the same purpose.
-        var hideInspect = PrefLoader.getPref("hideDefaultInspector");
-        if (hideInspect)
-        {
-            this.showItem("inspect-separator", false);
-            this.showItem("context-inspect", false);
-        }
-    }
-}
-
-// ********************************************************************************************* //
 // All Pages Activation" is on
 
 // Load Firebug by default if activation is on for all pages (see issue 5522)
diff --git a/extension/modules/loader.js b/extension/modules/loader.js
index 0e0653a..f75b560 100644
--- a/extension/modules/loader.js
+++ b/extension/modules/loader.js
@@ -125,6 +125,8 @@ var FirebugLoader =
                     el.parentNode.removeChild(el);
         });
 
+        win.Firebug.GlobalUI.unloadContextMenuOverlay(win);
+
         delete win.Firebug;
         delete win.FBTrace;
         delete win.FBL;
@@ -141,6 +143,8 @@ var FirebugLoader =
         // Apply all Firefox/SeaMonkey overlays to the browser window.
         loadSubscript("chrome://firebug/content/firefox/browserOverlay.js", win);
 
+        win.Firebug.GlobalUI.loadContextMenuOverlay(win);
+
         // Firebug extensions should initialize here.
         this.dispatchToScopes("topWindowLoad", [win]);
     },

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