From 3de6d3a7e14a2306aee526f3e22265a8b93f6b4e Mon Sep 17 00:00:00 2001 From: "dietrich%mozilla.com" Date: Tue, 18 Jul 2006 23:24:59 +0000 Subject: [PATCH] Bug 343803 Recently Closed Tabs > Open in Tabs shouldn't overwrite currently-opened tab (for zeniko, r=dietrich) --- browser/base/content/browser.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 0807d4c05df2..8c11abefc6e0 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6784,7 +6784,6 @@ HistoryMenu.populateUndoSubmenu = function PHM_populateUndoSubmenu() { undoPopup.parentNode.removeAttribute("disabled"); // populate menu - var urls = []; var undoItems = ss.getClosedTabData(window); var keys = undoItems.getKeys({}); for (var i = 0; i < keys.length; i++) { @@ -6796,7 +6795,6 @@ HistoryMenu.populateUndoSubmenu = function PHM_populateUndoSubmenu() { m.addEventListener("command", function(aEvent) { undoCloseTab(aEvent.originalTarget.getAttribute("value")); }, false); - urls.push(tabData.state.entries[0].url); } // "open in tabs" @@ -6805,7 +6803,10 @@ HistoryMenu.populateUndoSubmenu = function PHM_populateUndoSubmenu() { m = undoPopup.appendChild(document.createElement("menuitem")); m.setAttribute("label", strings.getString("menuOpenInTabs.label")); m.setAttribute("accesskey", strings.getString("menuOpenInTabs.accesskey")); - m.addEventListener("command", function() { loadOneOrMoreURIs(urls.join("|")); }, false); + m.addEventListener("command", function() { + for (var i = 0; i < keys.length; i++) + undoCloseTab(); + }, false); } /** @@ -6816,5 +6817,5 @@ HistoryMenu.populateUndoSubmenu = function PHM_populateUndoSubmenu() { function undoCloseTab(aIndex) { var ss = Cc["@mozilla.org/browser/sessionstore;1"]. getService(Ci.nsISessionStore); - ss.undoCloseTab(window, aIndex); + ss.undoCloseTab(window, aIndex || 0); }