From 961354e28460ccff349c314f689330442f217605 Mon Sep 17 00:00:00 2001
From: ilya
Date: Mon, 9 Nov 2009 00:52:25 -0800
Subject: Keep tab queue per-window instead of globally. This mirrors behavior
 in both Vim and Vimperator. Closes #2.

---
 background_page.html | 50 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 17 deletions(-)

(limited to 'background_page.html')
diff --git a/background_page.html b/background_page.html
index 7ba89c41..d15c3331 100644
--- a/background_page.html
+++ b/background_page.html
@@ -1,7 +1,7 @@
 <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
@@ -85,7 +85,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 +102,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
 
-- 
cgit v1.2.3


From be17ec68f6038e176b8a72e674697861228dfb56 Mon Sep 17 00:00:00 2001
From: ilya
Date: Mon, 9 Nov 2009 01:48:39 -0800
Subject: Implement 'gf' -- toggle view source for the current page.

---
 background_page.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'background_page.html')

diff --git a/background_page.html b/background_page.html
index d15c3331..df63632a 100644
--- a/background_page.html
+++ b/background_page.html
@@ -6,7 +6,8 @@
 
   // 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(); }
   });
@@ -138,6 +150,7 @@
   keyToCommandRegistry['<c-d>'] = "scrollPageDown";
   keyToCommandRegistry['<c-u>'] = "scrollPageUp";
   keyToCommandRegistry['r']  = 'reload';
+  keyToCommandRegistry['gf'] = 'toggleViewSource';
 
   keyToCommandRegistry['ba'] = 'goBack';
   keyToCommandRegistry['H']  = 'goBack';
-- 
cgit v1.2.3

