Merge pull request #413 from ueokande/reopen-current-window

Reopen current window

e2e/contents/tab.test.js

@@ -222,6 +222,8 @@ describe("tab test", () => {
     }).then((win) => {
       expect(win.tabs).to.have.lengthOf(1);
       return keys.press(win.tabs[0].id, 'u');
+    }).then(() => {
+      return new Promise((resolve) => setTimeout(resolve, 100));
     }).then(() => {
       return windows.get(targetWindow.id);
     }).then((win) => {

src/background/shared/tabs.js

@@ -59,13 +59,17 @@ const closeTabsByKeywordsForce = (keyword) => {
 };
 
 const reopenTab = () => {
-  return browser.sessions.getRecentlyClosed({
-    maxResults: 1
+  let window = null;
+  return browser.windows.getCurrent().then().then((w) => {
+    window = w;
+    return browser.sessions.getRecentlyClosed();
   }).then((sessions) => {
-    if (sessions.length === 0) {
+    let session = sessions.find((s) => {
+      return s.tab && s.tab.windowId === window.id;
+    });
+    if (!session) {
       return;
     }
-    let session = sessions[0];
     if (session.tab) {
       return browser.sessions.restore(session.tab.sessionId);
     }