Bug 343801 - History menu jumps around (disappears) since addition of new Recently Closed Tabs menu item. r=gavin.

git-svn-id: svn://10.0.0.236/trunk@201800 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla.mano%sent.com 2006-07-09 19:43:35 +00:00
parent cc67b9782b
commit ecc49a4a31
2 changed files with 8 additions and 4 deletions

View File

@ -378,7 +378,7 @@
oncommand="var url = event.target.getAttribute('statustext'); if (url) openUILink(url, event, false, true);"
onclick="checkForMiddleClick(this, event);">
<menupopup id="goPopup" onpopupshowing="updateGoMenu(this);" onpopuphiding="onGoMenuHidden();">
<menupopup id="goPopup" onpopupshowing="updateGoMenu(event, this);" onpopuphiding="onGoMenuHidden(event);">
<menuitem label="&backCmd.label;"
#ifdef XP_MACOSX
key="goBackKb2"

View File

@ -1650,9 +1650,10 @@ function constructGoMenuItem(goMenu, beforeItem, url, title)
return menuitem;
}
function onGoMenuHidden()
function onGoMenuHidden(aEvent)
{
setTimeout(destroyGoMenuItems, 0, document.getElementById('goPopup'));
if (aEvent.target == aEvent.currentTarget)
setTimeout(destroyGoMenuItems, 0, document.getElementById('goPopup'));
}
function destroyGoMenuItems(goMenu) {
@ -1677,8 +1678,11 @@ function destroyGoMenuItems(goMenu) {
}
}
function updateGoMenu(goMenu)
function updateGoMenu(aEvent, goMenu)
{
if (aEvent.target != aEvent.currentTarget)
return;
// In case the timer didn't fire.
destroyGoMenuItems(goMenu);