Merge pull request #10822 from adobe/kai/fix-10821-ld-allow-reload-in-browser

marcelgerber · marcelgerber · commit 3a0780e59b87 · 2015-05-31T22:53:03.000+02:00
Fix #10821. Allow page reloads, navigating away and back etc.
diff --git a/src/LiveDevelopment/LiveDevMultiBrowser.js b/src/LiveDevelopment/LiveDevMultiBrowser.js
@@ -557,9 +557,12 @@ define(function (require, exports, module) {
                     .on("ConnectionClose.livedev", function (event, msg) {
                         // close session when the last connection was closed
                         if (_protocol.getConnectionIds().length === 0) {
-                            if (exports.status <= STATUS_ACTIVE) {
-                                _close(false, "detached_target_closed");
-                            }
+                            setTimeout(function () {
+                                if (_protocol.getConnectionIds().length === 0 &&
+                                        exports.status <= STATUS_ACTIVE) {
+                                    _close(false, "detached_target_closed");
+                                }
+                            }, 5000);
                         }
                     })
                     // extract stylesheets and create related LiveCSSDocument instances
diff --git a/src/LiveDevelopment/MultiBrowserImpl/protocol/remote/LiveDevProtocolRemote.js b/src/LiveDevelopment/MultiBrowserImpl/protocol/remote/LiveDevProtocolRemote.js
@@ -286,7 +286,6 @@
         },
         
         onClose: function () {
-            // TODO: This is absolutely temporary solution.
             var body = document.getElementsByTagName("body")[0],
                 overlay = document.createElement("div"),
                 background = document.createElement("div"),
@@ -357,8 +356,7 @@
             try {
                 msg = JSON.parse(msgStr);
             } catch (e) {
-                console.log("[Brackets LiveDev] Invalid Message Received");
-                // TODO: we should probably send back an error message here?
+                console.log("[Brackets LiveDev] Malformed message received: ", msgStr);
                 return;
             }
             // delegates handling/routing to MessageBroker.
