Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Issue 5809: Firebug triggers Firefox crash on Ubuntu since the fix fo…

…r issue 5427
  • Loading branch information...
commit 4659a628d8e089a8e391a18bc974e08d887bd7d7 1 parent 8970fa8
@janodvarko janodvarko authored
View
4 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>
View
20 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)
@simonlindholm Owner

Needs an event parameter?

@janodvarko Owner

Yes, thanks!
Fixed at 81ec221

Honza

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
{
- 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);"
})
])
]);
Please sign in to comment.
Something went wrong with that request. Please try again.