Add support for reloading the debugger web app by retaining the user …

…selected tabids.
martinlippert · Jan 31, 2012 · 39d3510 · 39d3510
1 parent 318360c
commit 39d3510
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/extension/crxEnd/TabsAdapter.js b/extension/crxEnd/TabsAdapter.js
@@ -93,7 +93,7 @@ TabsAdapter.prototype = {
 
   onRemoved: function(tabId, removeInfo) {
     this.barrier(tabId, arguments, function(tabId, removeInfo, index) {
-      this.windowsAdapter.removeTab(index);
+      this.windowsAdapter.removeTab(tabId);
       this.postMessage({source: this.getPath(), method: 'onRemoved', params:{tabId: tabId, removeInfo: removeInfo}});
     });
   },

diff --git a/extension/crxEnd/WindowsAdapter.js b/extension/crxEnd/WindowsAdapter.js
@@ -26,7 +26,10 @@ function WindowsAdapter(origin, debuggerTab) {
   this.chromeTabIds = [];     // only these tabs can be used by client
 
   // chrome.debugger calls must complete before any other chrome.* calls
-  this.chromeQueue = []; 
+  this.chromeQueue = [];
+
+  // All user selected tabs are accessible to this debugger
+  WindowsAdapter.userSelectedTabs.forEach(this.addTab.bind(this));
 
   this._bindListeners();
   // chrome.window functions available to client WebApps
@@ -36,6 +39,7 @@ function WindowsAdapter(origin, debuggerTab) {
 
 WindowsAdapter.path = 'chrome.windows';
 WindowsAdapter.instanceCounter = 0;
+WindowsAdapter.userSelectedTabs = [];
 
 WindowsAdapter.prototype = {
 
@@ -52,6 +56,9 @@ WindowsAdapter.prototype = {
   },
 
   //------------------------------------------------------------------------------------ 
+  addUserSelectedTab: function(tabId) {
+    WindowsAdapter.userSelectedTabs.push(tabId);
+  },
 
   isAccessibleTab: function(tabId) {
     return (this.chromeTabIds.indexOf(tabId) > -1);
@@ -62,6 +69,11 @@ WindowsAdapter.prototype = {
   },
 
   removeTab: function(tabId) {
+    var userIndex = WindowsAdapter.userSelectedTabs.indexOf(tabId);
+    if (userIndex > -1) {
+      WindowsAdapter.userSelectedTabs.splice(userIndex, 1);
+    } // else not user selected
+
     var index = this.chromeTabIds.indexOf(tabId);
     if (index > -1) {
       this.chromeTabIds.splice(index, 1);

diff --git a/extension/crxEnd/background.html b/extension/crxEnd/background.html
@@ -81,7 +81,7 @@
           if (!windowsAdapter) {  // then this origin has not been seen
              windowsAdapter = crxEnd.createWindowsAdapter(validOrigin, debuggerTab);
           }
-          windowsAdapter.addTab(debuggeeTabId);
+          windowsAdapter.addUserSelectedTab(debuggeeTabId);
 
           var url = allowedSite.site + '?tabId=' + debuggeeTabId + '&';
           // now release the debugger