Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 348016 The "Recently closed tabs" menu is no longer functional after opening the "Customize toolbars" dialogue (r=mconnor)

Browse Source
This commit is contained in:
dietrich%mozilla.com 2006-08-16 06:17:03 +00:00
parent 25141f56ff
commit cf11c66bf7
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/browser-menubar.inc
View File

@ -364,7 +364,7 @@
<menuseparator id="startTabHistorySeparator"/>
<menuseparator hidden="true" id="endTabHistorySeparator"/>
<menu id="historyUndoMenu" label="&historyUndoMenu.label;" disabled="true">
<menupopup id="historyUndoPopup"/>
<menupopup id="historyUndoPopup" onpopupshowing="HistoryMenu.populateUndoSubmenu();"/>
</menu>
<menuseparator id="endUndoSeparator"/>
<menuitem id="sanitizeItem"
@ -406,7 +406,7 @@
<menuseparator id="startHistorySeparator"/>
<menuseparator hidden="true" id="endHistorySeparator"/>
<menu id="historyUndoMenu" label="&historyUndoMenu.label;" disabled="true">
<menupopup id="historyUndoPopup"/>
<menupopup id="historyUndoPopup" onpopupshowing="HistoryMenu.populateUndoSubmenu();"/>
</menu>
<menuseparator id="endUndoSeparator"/>
<menuitem observes="viewHistorySidebar" label="&historyShowSidebarCmd.label;"

31
browser/base/content/browser.js
View File

@ -1131,9 +1131,6 @@ function delayedStartup()
// browser-specific tab augmentation
AugmentTabs.init();
// set up history menu
HistoryMenu.init();
}
function BrowserShutdown()
@ -1741,6 +1738,9 @@ function updateGoMenu(aEvent, goMenu)
if (showSep)
endSep.hidden = false;
// enable/disable RCT sub menu
HistoryMenu.toggleRecentlyClosedTabs();
}
function addBookmarkAs(aBrowser, aBookmarkAllTabs, aIsWebPanel)
@ -3221,6 +3221,10 @@ function FillHistoryMenu(aParent, aMenu, aInsertBefore)
}
break;
}
// enable/disable RCT sub menu
HistoryMenu.toggleRecentlyClosedTabs();
return true;
}
@ -6836,17 +6840,18 @@ var AugmentTabs = {
var HistoryMenu = {};
#endif
HistoryMenu.init = function PHM_init() {
this.initializeUndoSubmenu();
}
HistoryMenu.toggleRecentlyClosedTabs = function PHM_toggleRecentlyClosedTabs() {
// enable/disable the Recently Closed Tabs sub menu
var undoPopup = document.getElementById("historyUndoPopup");
/**
* Initialize the "Undo Close Tabs" menu
*/
HistoryMenu.initializeUndoSubmenu = function PHM_initializeUndoSubmenu() {
// get history menupopup
var histMenu = document.getElementById("goPopup");
histMenu.addEventListener("popupshowing", function() { HistoryMenu.populateUndoSubmenu(); }, false);
// get closed-tabs from nsSessionStore
var ss = Cc["@mozilla.org/browser/sessionstore;1"].
getService(Ci.nsISessionStore);
// no restorable tabs, so disable menu
if (ss.getClosedTabCount(window) == 0)
undoPopup.parentNode.setAttribute("disabled", true);
else
undoPopup.parentNode.removeAttribute("disabled");
}
/**