[Pkg-mozext-commits] [firebug] 21/28: Issue 5809: Firebug triggers Firefox crash on Ubuntu since the fix for issue 5427
David Prévot
taffit at moszumanska.debian.org
Mon Mar 31 22:46:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag firebug-1.10.3
in repository firebug.
commit 435d32f423995a9b7397926a7e771a7bf96ff605
Author: Jan Odvarko <odvarko at gmail.com>
Date: Tue Aug 14 14:16:27 2012 +0200
Issue 5809: Firebug triggers Firefox crash on Ubuntu since the fix for issue 5427
---
extension/content/firebug/firebugOverlay.xul | 4 ++--
extension/content/firebug/firefox/browserOverlay.js | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/extension/content/firebug/firebugOverlay.xul b/extension/content/firebug/firebugOverlay.xul
index 04ea828..78a93a0 100644
--- a/extension/content/firebug/firebugOverlay.xul
+++ b/extension/content/firebug/firebugOverlay.xul
@@ -62,8 +62,8 @@
<image src="chrome://firebug/skin/firebug.png"/>
<menupopup id="menu_firebug_iconMenu" class="fbFirebugMenuPopup"
- onpopupshowing="return Firebug.GlobalUI.onMenuShowing(this);"
- onpopuphiding="return Firebug.GlobalUI.onMenuHiding(this);">
+ onpopupshowing="return Firebug.GlobalUI.onMenuShowing(this, event);"
+ onpopuphiding="return Firebug.GlobalUI.onMenuHiding(this, event);">
<!-- Content comes from firebugMenuContent -->
</menupopup>
</toolbarbutton>
diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
index 8e840b4..11d4b17 100644
--- a/extension/content/firebug/firefox/browserOverlay.js
+++ b/extension/content/firebug/firefox/browserOverlay.js
@@ -374,10 +374,10 @@ Firebug.GlobalUI =
PrefLoader.setPref(option, checked);
},
- onMenuShowing: function(popup)
+ onMenuShowing: function(popup, event)
{
- // If this popup is already open the event comes from a sub menu, just ignore it.
- if (popup.state == "open")
+ // If the event comes from a sub menu, just ignore it.
+ if (popup != event.target)
return;
while (popup.lastChild)
@@ -451,7 +451,7 @@ Firebug.GlobalUI =
onMenuHiding: function(popup)
{
- if (popup.state == "open")
+ if (popup != event.target)
return;
// xxxHonza: I don't know why the timeout must be here, but if it isn't
@@ -1072,8 +1072,8 @@ $menupopupOverlay($("menuWebDeveloperPopup"), [
$menupopup({
id: "menu_firebug_firebugMenuPopup",
"class": "fbFirebugMenuPopup",
- onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this);",
- onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this);"
+ onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this, event);",
+ onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this, event);"
})
]),
$menuseparator({
@@ -1095,8 +1095,8 @@ $menupopupOverlay($("appmenu_webDeveloper_popup"), [
$menupopup({
id: "appmenu_firebugMenuPopup",
"class": "fbFirebugMenuPopup",
- onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this);",
- onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this);"
+ onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this, event);",
+ onpopuphiding: "return Firebug.GlobalUI.onMenuHiding(this, event);"
})
]),
$menuseparator({
@@ -1117,8 +1117,8 @@ $menupopupOverlay($("toolsPopup"), [
$menupopup({
id: "toolsmenu_firebugMenuPopup",
"class": "fbFirebugMenuPopup",
- onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this);",
- onpopupshowing: "return Firebug.GlobalUI.onMenuHiding(this);"
+ onpopupshowing: "return Firebug.GlobalUI.onMenuShowing(this, event);",
+ onpopupshowing: "return Firebug.GlobalUI.onMenuHiding(this, event);"
})
])
]);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git
More information about the Pkg-mozext-commits
mailing list