Merge pull request #421 from bernardofire/tabs

solve issue #405

1 files changed, 19 insertions, 8 deletions

diff --git a/background_page.html b/background_page.html
index 77e36bb6..5866ee48 100644
--- a/background_page.html
+++ b/background_page.html
@@ -331,23 +331,34 @@
 
   function nextTab(callback) { selectTab(callback, "next"); }
   function previousTab(callback) { selectTab(callback, "previous"); }
+  function firstTab(callback) { selectTab(callback, "first"); }
+  function lastTab(callback) { selectTab(callback, "last"); }
 
   /*
-   * Selects a tab before or after the currently selected tab. Direction is either "next" or "previous".
+   * Selects a tab before or after the currently selected tab. Direction is either "next", "previous", "first" or "last".
    */
   function selectTab(callback, direction) {
     chrome.tabs.getAllInWindow(null, function(tabs) {
       if (tabs.length <= 1)
         return;
-      for (var i = 0; i < tabs.length; i++) {
-        if (tabs[i].selected) {
-          var delta = (direction == "next") ? 1 : -1;
-          var toSelect = tabs[(i + delta + tabs.length) % tabs.length];
+      chrome.tabs.getSelected(null, function(currentTab) {
+          switch (direction) {
+            case "next":
+              toSelect = tabs[(currentTab.index + 1 + tabs.length) % tabs.length];
+              break;
+            case "previous":
+              toSelect = tabs[(currentTab.index - 1 + tabs.length) % tabs.length];
+              break;
+            case "first":
+              toSelect = tabs[0];
+              break;
+            case "last":
+              toSelect = tabs[tabs.length - 1];
+              break;
+          }
           selectionChangedHandlers.push(callback);
           chrome.tabs.update(toSelect.id, { selected: true });
-          break;
-        }
-      }
+      });
     });
   }