Live Preview - Fix currentDocumentChange handling

src/LiveDevelopment/Inspector/inspector.html

@@ -33,7 +33,7 @@
 });
 });
 </script>
-<link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet">
+<link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet" rel="stylesheet">
 <style>
 body {padding: 70px 0 20px 0;}
 h3, dl {font-family: Menlo, Monaco, "Courier New", monospace;}

src/LiveDevelopment/LiveDevelopment.js

@@ -238,7 +238,9 @@ define(function LiveDevelopment(require, exports, module) {
         }
 
         // Clear all documents from request filtering
-        _server.clear();
+        if (_server) {
+            _server.clear();
+        }
     }
 
     /**
@@ -533,8 +535,6 @@ define(function LiveDevelopment(require, exports, module) {
             // No longer in site, so terminate live dev, but don't close browser window
             Inspector.disconnect();
             _closeReason = "navigated_away";
-            _setStatus(STATUS_INACTIVE);
-            _server = null;
         }
     }
 
@@ -545,12 +545,17 @@ define(function LiveDevelopment(require, exports, module) {
 
         unloadAgents();
 
-        // Stop listening for requests when disconnected
-        _server.stop();
-
         // Close live documents 
         _closeDocuments();
 
+        if (_server) {
+            // Stop listening for requests when disconnected
+            _server.stop();
+
+            // Dispose server
+            _server = null;
+        }
+
         _setStatus(STATUS_INACTIVE);
     }
 
@@ -593,11 +598,15 @@ define(function LiveDevelopment(require, exports, module) {
         }
 
         if (Inspector.connected()) {
-            var timer = window.setTimeout(cleanup, 5000); // 5 seconds
-            Inspector.Runtime.evaluate("window.open('', '_self').close();", function (response) {
-                Inspector.disconnect();
-                window.clearTimeout(timer);
-                cleanup();
+            // Close the browser tab/window
+            var closePromise = Inspector.Runtime.evaluate("window.open('', '_self').close();");
+
+            // Add a timeout to force cleanup if Inspector does not respond
+            closePromise = Async.withTimeout(closePromise, 5000);
+
+            // Disconnect the Inspector after closing the tab/winow
+            closePromise.always(function () {
+                Inspector.disconnect().always(cleanup);
             });
         } else {
             cleanup();
@@ -922,23 +931,21 @@ define(function LiveDevelopment(require, exports, module) {
     function _onDocumentChange() {
         var doc = _getCurrentDocument();
 
-        if (!doc) {
+        if (!doc || !Inspector.connected()) {
             return;
         }
 
-        if (Inspector.connected()) {
-            hideHighlight();
-
-            // close the current session and begin a new session if the current
-            // document changes to an HTML document that was not loaded yet
-            var wasRequested = agents.network && agents.network.wasURLRequested(doc.url),
-                isHTML = exports.config.experimental || _isHtmlFileExt(doc.extension);
-
-            if (!wasRequested && isHTML) {
-                // TODO (jasonsanjose): optimize this by reusing the same connection
-                // no need to fully teardown.
-                close().done(open);
-            }
+        hideHighlight();
+
+        // close the current session and begin a new session if the current
+        // document changes to an HTML document that was not loaded yet
+        var wasRequested = agents.network && agents.network.wasURLRequested(doc.url),
+            isViewable = exports.config.experimental || _server.canServe(doc.file.fullPath);
+
+        if (!wasRequested && isViewable) {
+            // TODO (jasonsanjose): optimize this by reusing the same connection
+            // no need to fully teardown.
+            close().done(open);
         }
     }
 

test/spec/LiveDevelopment-test.js

@@ -511,10 +511,7 @@ define(function (require, exports, module) {
 
             afterEach(function () {
                 waitsForDone(LiveDevelopment.close(), "Waiting for browser to become inactive", 10000);
-
-                runs(function () {
-                    testWindow.closeAllFiles();
-                });
+                testWindow.closeAllFiles();
             });
 
             it("should establish a browser connection for an opened html file", function () {
@@ -690,7 +687,7 @@ define(function (require, exports, module) {
                     // Verify that we still have modified text
                     expect(updatedNode.value).toBe("Live Preview in Brackets is awesome!");
                 });
-                    
+
                 // Save original content back to the file after this test passes/fails
                 runs(function () {
                     htmlDoc.setText(origHtmlText);