From 6b2f967dab313ee381d1ab94bfcfd540da7086d8 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@ajax.org>
Date: Thu, 12 Nov 2015 20:13:07 +0000
Subject: [PATCH] Focus previously focussed tab when cancelling preview mode

---
 plugins/c9.ide.editors/tabmanager.js       | 8 ++++++--
 plugins/c9.ide.preferences/experimental.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/c9.ide.editors/tabmanager.js b/plugins/c9.ide.editors/tabmanager.js
index fa60a1b9..c289b62a 100644
--- a/plugins/c9.ide.editors/tabmanager.js
+++ b/plugins/c9.ide.editors/tabmanager.js
@@ -1345,6 +1345,8 @@ define(function(require, module, exports) {
         }
 
         function cancelPreview(keep) {
+            var lastFocussedTab = focussedTab;
+            
             // Unload last preview tab
             if (lastPreviewTab) {
                 lastPreviewTab.unload();
@@ -1364,11 +1366,13 @@ define(function(require, module, exports) {
                 delete previewTab.document.meta.existing;
             }
             else {
-                previewTab.unload();
+                var tab = previewTab;
+                previewTab = null;
+                tab.unload(); // TODO this focusses the last tab. If there is a speed concern, fix this.
             }
             
             previewTab = null;
-            focussedTab && focussedTab.activate();
+            lastFocussedTab && lastFocussedTab.activate();
             return false;
         }
         
diff --git a/plugins/c9.ide.preferences/experimental.js b/plugins/c9.ide.preferences/experimental.js
index 621400b4..8160966d 100644
--- a/plugins/c9.ide.preferences/experimental.js
+++ b/plugins/c9.ide.preferences/experimental.js
@@ -77,7 +77,7 @@ define(function(require, exports, module) {
                         "To see the effect of this change, please refresh Cloud9.");
                     hasAlerted = true;
                 }
-            }
+            };
             
             if (!found[name])
                 plugin.add(obj, plugin);