Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/background/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -909,17 +909,25 @@ function start(browser) {
}
return base;
}
function _getTabIndex(tabs, tabId) {
var tabIds = tabs.map(function(e) { return e.id; });
return tabIds.indexOf(tabId);
}
function _nextTab(tab, step) {
if (tab) {
chrome.tabs.query({
windowId: tab.windowId
}, function(tabs) {
if (tab.index == 0 && step == -1) {
var tabIndex = _getTabIndex(tabs, tab.id);
if (tabIndex === -1) {
return;
}
if (tabIndex == 0 && step == -1) {
step = tabs.length -1 ;
} else if (tab.index == tabs.length -1 && step == 1 ) {
} else if (tabIndex == tabs.length -1 && step == 1 ) {
step = 1 - tabs.length ;
}
var to = _fixTo(tab.index + step, tabs.length - 1);
var to = _fixTo(tabIndex + step, tabs.length - 1);
chrome.tabs.update(tabs[to].id, {
active: true
});
Expand All @@ -941,11 +949,13 @@ function start(browser) {
chrome.tabs.query({
windowId: tab.windowId
}, function(tabs) {
var tabIds = tabs.map(function(e) {
return e.id;
});
var tabIndex = _getTabIndex(tabs, tab.id);
if (tabIndex === -1) {
return;
}
repeats = _fixTo(repeats, tabs.length);
var base = _roundBase(tab.index, repeats, tabs.length);
var base = _roundBase(tabIndex, repeats, tabs.length);
var tabIds = tabs.map(function(e) { return e.id; });
operation(tabIds.slice(base, base + repeats));
});
} else {
Expand Down