Undo 'Keep tab queue indices updated when a tab is detached'.

It does not follow Chrome's native behavior (and was buggy anyway.)

1 files changed, 4 insertions, 10 deletions

diff --git a/background_page.html b/background_page.html
index 0c8b2d20..4c328a20 100644
--- a/background_page.html
+++ b/background_page.html
@@ -327,7 +327,6 @@
     // We should update all the tabs in the old window and the new window.
     if (openTabs[tabId]) {
       updatePositionsAndWindowsForAllTabsInWindow(openTabs[tabId].windowId);
-      updateTabQueueIndices(openTabs[tabId].windowId, openTabs[tabId].positionIndex);
     }
     updatePositionsAndWindowsForAllTabsInWindow(attachedInfo.newWindowId);
   });
@@ -336,14 +335,6 @@
     updatePositionsAndWindowsForAllTabsInWindow(moveInfo.windowId);
   });
 
-  function updateTabQueueIndices(windowId, positionIndex) {
-    for (var i in tabQueue[windowId]) {
-      if (tabQueue[windowId][i].positionIndex > positionIndex) {
-        tabQueue[windowId][i].positionIndex--;
-      }
-    }
-  }
-
   chrome.tabs.onRemoved.addListener(function(tabId) {
     var openTabInfo = openTabs[tabId];
     updatePositionsAndWindowsForAllTabsInWindow(openTabInfo.windowId);
@@ -352,7 +343,10 @@
     // Pretend they never existed and adjust tab indices accordingly.
     // Could possibly expand this into a blacklist in the future
     if (/^chrome[^:]*:\/\/.*/.test(openTabInfo.url)) {
-      updateTabQueueIndices(openTabInfo.windowId, openTabInfo.positionIndex);
+      for (var i in tabQueue[openTabInfo.windowId]) {
+        if (tabQueue[openTabInfo.windowId][i].positionIndex > openTabInfo.positionIndex)
+          tabQueue[openTabInfo.windowId][i].positionIndex--;
+      }
       return;
     }