diff options
| author | Phil Crosby | 2009-11-11 00:28:09 -0800 |
|---|---|---|
| committer | Phil Crosby | 2009-11-11 00:28:09 -0800 |
| commit | 300fa151c6f59955f9deb7ef2e195f11d79a95ec (patch) | |
| tree | 8d599ba7ed0b585b7439c1b938c21736cb85f60f /background_page.html | |
| parent | d367e58a555606b7ad232fa880484cad8a2f7844 (diff) | |
| parent | 263ee35bcd468004718ee0457967c57991b0f09b (diff) | |
| download | vimium-300fa151c6f59955f9deb7ef2e195f11d79a95ec.tar.bz2 | |
Merge branch 'master' of github.com:philc/vimium
Conflicts:
vimiumFrontend.js
Diffstat (limited to 'background_page.html')
| -rw-r--r-- | background_page.html | 65 |
1 files changed, 47 insertions, 18 deletions
diff --git a/background_page.html b/background_page.html index a85d8a4f..948aad90 100644 --- a/background_page.html +++ b/background_page.html @@ -1,12 +1,13 @@ <html> <head> <script type="text/javascript" charset="utf-8"> - var tabQueue = []; // Queue of tabs to restore with scroll info + var tabQueue = {}; // windowId -> Array var keyQueue = ""; // Queue of keys typed // Port handler mapping var portHandlers = { "keyDown": handleKeyDown, - "returnScrollPosition": handleReturnScrollPosition }; + "returnScrollPosition": handleReturnScrollPosition, + "getCurrentTabUrl": getCurrentTabUrl }; // Event handlers var selectionChangedHandlers = []; @@ -38,6 +39,17 @@ } } + /* + * Used by the content scripts to get their full URL. This is needed for URLs like "view-source:http:// .." + * because window.location doesn't know anything about the Chrome-specific "view-source:". + */ + function getCurrentTabUrl(args) { + chrome.tabs.getSelected(null, function (tab) { + var returnPort = chrome.tabs.connect(tab.id, { name: "returnCurrentTabUrl" }); + returnPort.postMessage({ url: tab.url }); + }); + } + chrome.tabs.onSelectionChanged.addListener(function (tabId, selectionInfo) { if (selectionChangedHandlers.length > 0) { selectionChangedHandlers.pop().call(); } }); @@ -85,7 +97,15 @@ function removeTab(callback) { getCurrentTabWithScrollPosition(function(tab, scrollX, scrollY) { - tabQueue.push({ tabUrl: tab.url, scrollX: scrollX, scrollY: scrollY }); + var tabQueueEntry = { tabUrl: tab.url, + scrollX: scrollX, + scrollY: scrollY }; + + if (tabQueue[tab.windowId]) + tabQueue[tab.windowId].push(tabQueueEntry); + else + tabQueue[tab.windowId] = [tabQueueEntry]; + chrome.tabs.remove(tab.id); // We can't just call the callback here because we actually need to wait // for the selection to change to consider this action done. @@ -94,21 +114,29 @@ } function restoreTab(callback) { - if (tabQueue.length > 0) { - var tabQueueEntry = tabQueue.pop(); - - // We have to chain a few callbacks to set the appropriate scroll position. We can't just wait until the - // tab is created because the content script is not available during the "loading" state. We need to - // wait until that's over before we can call setScrollPosition. - chrome.tabs.create({ url: tabQueueEntry.tabUrl }, function(tab) { - tabLoadedHandlers[tab.id] = function() { - var scrollPort = chrome.tabs.connect(tab.id, {name: "setScrollPosition"}); - scrollPort.postMessage({ scrollX: tabQueueEntry.scrollX, scrollY: tabQueueEntry.scrollY }); - }; - - callback(); - }); - } + // TODO(ilya): Should this be getLastFocused instead? + chrome.windows.getCurrent(function (window) { + if (tabQueue[window.id] && tabQueue[window.id].length > 0) + { + var tabQueueEntry = tabQueue[window.id].pop(); + + // Clean out the tabQueue so we don't have unused windows laying about. + if (tabQueue[window.id].length == 0) + delete tabQueue[window.id]; + + // We have to chain a few callbacks to set the appropriate scroll position. We can't just wait until the + // tab is created because the content script is not available during the "loading" state. We need to + // wait until that's over before we can call setScrollPosition. + chrome.tabs.create({ url: tabQueueEntry.tabUrl }, function(tab) { + tabLoadedHandlers[tab.id] = function() { + var scrollPort = chrome.tabs.connect(tab.id, {name: "setScrollPosition"}); + scrollPort.postMessage({ scrollX: tabQueueEntry.scrollX, scrollY: tabQueueEntry.scrollY }); + }; + + callback(); + }); + } + }); } // End action functions @@ -122,6 +150,7 @@ keyToCommandRegistry['<c-d>'] = "scrollPageDown"; keyToCommandRegistry['<c-u>'] = "scrollPageUp"; keyToCommandRegistry['r'] = 'reload'; + keyToCommandRegistry['gf'] = 'toggleViewSource'; keyToCommandRegistry['ba'] = 'goBack'; keyToCommandRegistry['H'] = 'goBack'; |