Live Preview fixes

src/LiveDevelopment/Agents/ConsoleAgent.js

@@ -45,6 +45,9 @@ define(function ConsoleAgent(require, exports, module) {
             level = "warn";
         }
         var text = "ConsoleAgent: " + message.text;
+        if (message.url) {
+            text += " (url: " + message.url + ")";
+        }
         if (message.stackTrace) {
             var callFrame = message.stackTrace[0];
             text += " in " + callFrame.functionName + ":" + callFrame.columnNumber;

src/LiveDevelopment/LiveDevelopment.js

@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
-/*global define, $, brackets, window */
+/*global define, $, brackets, window, open */
 
 /**
  * LiveDevelopment manages the Inspector, all Agents, and the active LiveDocument
@@ -154,6 +154,9 @@ define(function LiveDevelopment(require, exports, module) {
     var _liveDocument;        // the document open for live editing.
     var _relatedDocuments;    // CSS and JS documents that are used by the live HTML document
     var _openDeferred;        // promise returned for each call to open()
+
+    // Disallow re-entrancy of loadAgents()
+    var _loadAgentsPromise;
 
     /**
      * Current live preview server
@@ -545,11 +548,18 @@ define(function LiveDevelopment(require, exports, module) {
 
     /** Load the agents */
     function loadAgents() {
+        // If we're already loading agents return same promise
+        if (_loadAgentsPromise) {
+            return _loadAgentsPromise;
+        }
+
         var result = new $.Deferred(),
             promises = [],
             enableAgentsPromise,
             allAgentsPromise;
 
+        _loadAgentsPromise = result.promise();
+
         _setStatus(STATUS_LOADING_AGENTS);
 
         // load agents in parallel
@@ -598,21 +608,25 @@ define(function LiveDevelopment(require, exports, module) {
 
         allAgentsPromise.fail(result.reject);
 
-        // show error loading live dev dialog
-        result.fail(function () {
-            _setStatus(STATUS_ERROR);
-
-            Dialogs.showModalDialog(
-                Dialogs.DIALOG_ID_ERROR,
-                Strings.LIVE_DEVELOPMENT_ERROR_TITLE,
-                Strings.LIVE_DEV_LOADING_ERROR_MESSAGE
-            );
-        });
+        result
+            .fail(function () {
+                // show error loading live dev dialog
+                _setStatus(STATUS_ERROR);
+
+                Dialogs.showModalDialog(
+                    Dialogs.DIALOG_ID_ERROR,
+                    Strings.LIVE_DEVELOPMENT_ERROR_TITLE,
+                    Strings.LIVE_DEV_LOADING_ERROR_MESSAGE
+                );
+            })
+            .always(function () {
+                _loadAgentsPromise = null;
+            });
 
         // resolve/reject the open() promise after agents complete
         result.then(_openDeferred.resolve, _openDeferred.reject);
 
-        return result.promise();
+        return _loadAgentsPromise;
     }
 
     /**
@@ -752,7 +766,12 @@ define(function LiveDevelopment(require, exports, module) {
         $(Inspector.Page).off(".livedev");
         $(Inspector).off(".livedev");
 
-        unloadAgents();
+        // Wait if agents are loading
+        if (_loadAgentsPromise) {
+            _loadAgentsPromise.always(unloadAgents);
+        } else {
+            unloadAgents();
+        }
 
         // Close live documents 
         _closeDocuments();
@@ -816,11 +835,11 @@ define(function LiveDevelopment(require, exports, module) {
         }
 
         if (_openDeferred) {
-            _doInspectorDisconnect(doCloseWindow).done(cleanup);
-
             if (_openDeferred.state() === "pending") {
                 _openDeferred.reject();
             }
+
+            _doInspectorDisconnect(doCloseWindow).done(cleanup);
         } else {
             // Deferred may not be created yet
             // We always close attempt to close the live dev connection on
@@ -886,10 +905,16 @@ define(function LiveDevelopment(require, exports, module) {
 
     /**
      * Unload and reload agents
+     * @return {jQuery.Promise} Resolves once the agents are loaded
      */
     function reconnect() {
+        if (_loadAgentsPromise) {
+            // Agents are already loading, so don't unload
+            return _loadAgentsPromise;
+        }
+
         unloadAgents();
-        loadAgents();
+        return loadAgents();
     }
 
     /**
@@ -905,7 +930,7 @@ define(function LiveDevelopment(require, exports, module) {
      * Create a promise that resolves when the interstitial page has
      * finished loading.
      * 
-     * @return {jQuery.Promise}
+     * @return {jQuery.Promise} Resolves once page is loaded
      */
     function _waitForInterstitialPageLoad() {
         var deferred    = $.Deferred(),
@@ -954,7 +979,8 @@ define(function LiveDevelopment(require, exports, module) {
             // navigate to the page first before loading can complete.
             // To accomodate this, we load all agents and navigate in
             // parallel.
-            loadAgents();
+            loadAgents();   // TODO - should we use Async.doInParallel() here?
+                            // We could also separate into preLoadAgents() and postLoadAgents()
 
             _getInitialDocFromCurrent().done(function (doc) {
                 if (doc) {
@@ -1018,14 +1044,14 @@ define(function LiveDevelopment(require, exports, module) {
         var browserStarted  = false,
             retryCount      = 0;
 
-        // Open the live browser if the connection fails, retry 6 times
+        // Open the live browser if the connection fails, retry 3 times
         Inspector.connectToURL(launcherUrl).fail(function onConnectFail(err) {
             if (err === "CANCEL") {
                 _openDeferred.reject(err);
                 return;
             }
 
-            if (retryCount > 6) {
+            if (retryCount > 3) {
                 _setStatus(STATUS_ERROR);
 
                 var dialogPromise = Dialogs.showModalDialog(
@@ -1053,10 +1079,8 @@ define(function LiveDevelopment(require, exports, module) {
                         _close()
                             .done(function () {
                                 browserStarted = false;
-                                window.setTimeout(function () {
-                                    // After browser closes, try to open the interstitial page again
-                                    _openInterstitialPage();
-                                });
+                                // Continue to use _openDeferred
+                                open(true);
                             })
                             .fail(function (err) {
                                 // Report error?
@@ -1119,7 +1143,7 @@ define(function LiveDevelopment(require, exports, module) {
             if (exports.status !== STATUS_ERROR) {
                 window.setTimeout(function retryConnect() {
                     Inspector.connectToURL(launcherUrl).fail(onConnectFail);
-                }, 500);
+                }, 3000);
             }
         });
     }
@@ -1187,9 +1211,16 @@ define(function LiveDevelopment(require, exports, module) {
         return deferred.promise();
     }
 
-    /** Open the Connection and go live */
-    function open() {
-        _openDeferred = new $.Deferred();
+    /**
+     * Open the Connection and go live
+     *
+     * @param {!boolean} restart  true if relaunching and _openDeferred already exists
+     * @return {jQuery.Promise} Resolves once live preview is open
+     */
+    function open(restart) {
+        if (!restart) {
+            _openDeferred = new $.Deferred();
+        }
 
         // TODO: need to run _onDocumentChange() after load if doc != currentDocument here? Maybe not, since activeEditorChange
         // doesn't trigger it, while inline editors can still cause edits in doc other than currentDoc...
@@ -1293,7 +1324,12 @@ define(function LiveDevelopment(require, exports, module) {
 
         if (wasRequested) {
             // Unload and reload agents before reloading the page
-            reconnect();
+            // Some agents (e.g. DOMAgent and RemoteAgent) require us to
+            // navigate to the page first before loading can complete.
+            // To accomodate this, we load all agents (in reconnect())
+            // and navigate in parallel.
+            reconnect();    // TODO - should we use Async.doInParallel() here?
+                            // We could also separate into preLoadAgents() and postLoadAgents()
 
             // Reload HTML page
             Inspector.Page.reload();