deploy: 851cfff

Author: phoenixide

LiveDevelopment/LiveDevMultiBrowser.js

@@ -58,15 +58,15 @@ define(function (require, exports, module) {
 
 
     // Status Codes
-    var STATUS_INACTIVE      = exports.STATUS_INACTIVE       =  0;
-    var STATUS_CONNECTING    = exports.STATUS_CONNECTING     =  1;
-    var STATUS_ACTIVE        = exports.STATUS_ACTIVE         =  2;
-    var STATUS_OUT_OF_SYNC   = exports.STATUS_OUT_OF_SYNC    =  3;
-    var STATUS_SYNC_ERROR    = exports.STATUS_SYNC_ERROR     =  4;
-    var STATUS_RELOADING     = exports.STATUS_RELOADING      =  5;
-    var STATUS_RESTARTING    = exports.STATUS_RESTARTING     =  6;
-
-    var CommandManager       = require("command/CommandManager"),
+    const STATUS_INACTIVE      = exports.STATUS_INACTIVE       =  0;
+    const STATUS_CONNECTING    = exports.STATUS_CONNECTING     =  1;
+    const STATUS_ACTIVE        = exports.STATUS_ACTIVE         =  2;
+    const STATUS_OUT_OF_SYNC   = exports.STATUS_OUT_OF_SYNC    =  3;
+    const STATUS_SYNC_ERROR    = exports.STATUS_SYNC_ERROR     =  4;
+    const STATUS_RELOADING     = exports.STATUS_RELOADING      =  5;
+    const STATUS_RESTARTING    = exports.STATUS_RESTARTING     =  6;
+
+    const CommandManager       = require("command/CommandManager"),
         Commands             = require("command/Commands"),
         Dialogs              = require("widgets/Dialogs"),
         DefaultDialogs       = require("widgets/DefaultDialogs"),
@@ -86,7 +86,7 @@ define(function (require, exports, module) {
         DefaultLauncher      = require("LiveDevelopment/MultiBrowserImpl/launchers/Launcher");
 
     // Documents
-    var LiveCSSDocument      = require("LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument"),
+    const LiveCSSDocument      = require("LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument"),
         LiveHTMLDocument     = require("LiveDevelopment/MultiBrowserImpl/documents/LiveHTMLDocument");
 
     /**
@@ -96,6 +96,12 @@ define(function (require, exports, module) {
      */
     var _liveDocument;
 
+    /**
+     * Live preview only tracks the pinned document.
+     * @type {boolean}
+     */
+    let livePreviewUrlPinned = false;
+
     /**
      * @private
      * Live documents related to the active HTML document - for example, CSS files
@@ -652,7 +658,7 @@ define(function (require, exports, module) {
      */
     function _onFileChange() {
         var doc = DocumentManager.getCurrentDocument();
-        if (!isActive() || !doc) {
+        if (!isActive() || !doc || livePreviewUrlPinned) {
             return;
         }
 
@@ -875,6 +881,13 @@ define(function (require, exports, module) {
         }
     }
 
+    /**
+     * @param urlPinned {boolean}
+     */
+    function setLivePreviewPinned(urlPinned) {
+        livePreviewUrlPinned = urlPinned;
+    }
+
     /**
      * Returns current project server config. Copied from original LiveDevelopment.
      */
@@ -897,15 +910,14 @@ define(function (require, exports, module) {
     }
 
     // for unit testing only
-    function _getCurrentLiveDoc() {
+    function getCurrentLiveDoc() {
         return _liveDocument;
     }
 
     EventDispatcher.makeEventDispatcher(exports);
 
     // For unit testing
     exports._server                   = _server;
-    exports._getCurrentLiveDoc        = _getCurrentLiveDoc;
     exports._getInitialDocFromCurrent = _getInitialDocFromCurrent;
 
     // Export public functions
@@ -919,7 +931,9 @@ define(function (require, exports, module) {
     exports.redrawHighlight     = redrawHighlight;
     exports.init                = init;
     exports.isActive            = isActive;
+    exports.setLivePreviewPinned= setLivePreviewPinned;
     exports.getServerBaseUrl    = getServerBaseUrl;
+    exports.getCurrentLiveDoc   = getCurrentLiveDoc;
     exports.getCurrentProjectServerConfig = getCurrentProjectServerConfig;
     exports.setTransport        = setTransport;
     exports.setLauncher         = setLauncher;

LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js

@@ -151,7 +151,7 @@ define(function (require, exports, module) {
         //       Temporarily disabling this code to make JS editing work.
 //      this._detachFromEditor();
 
-        if (newActive && newActive.document === this.doc) {
+        if (newActive && newActive.document.file.fullPath === this.doc.file.fullPath) {
             this._attachToEditor(newActive);
         }
     };
@@ -165,6 +165,7 @@ define(function (require, exports, module) {
         this.editor = editor;
 
         if (this.editor) {
+            this.setInstrumentationEnabled(true, true);
             this.editor.on("cursorActivity", this._onCursorActivity);
             this.updateHighlight();
         }

LiveDevelopment/MultiBrowserImpl/documents/LiveHTMLDocument.js

@@ -49,6 +49,7 @@ define(function (require, exports, module) {
      */
     function LiveHTMLDocument(protocol, urlResolver, doc, editor) {
         LiveDocument.apply(this, arguments);
+        this.doc.addRef();
 
         this._instrumentationEnabled = false;
         this._relatedDocuments = {
@@ -98,13 +99,14 @@ define(function (require, exports, module) {
      * TODO: this doesn't seem necessary...if we're a live document, we should
      * always have instrumentation on anyway.
      * @param {boolean} enabled
+     * @param {boolean} [force]
      */
-    LiveHTMLDocument.prototype.setInstrumentationEnabled = function (enabled) {
+    LiveHTMLDocument.prototype.setInstrumentationEnabled = function (enabled, force) {
         if (!this.editor) {
             // TODO: error
             return;
         }
-        if (enabled && !this._instrumentationEnabled) {
+        if (enabled && (force || !this._instrumentationEnabled)) {
             // TODO: not clear why we do this here instead of waiting for the next time we want to
             // generate the instrumented HTML. This won't work if the dom offsets are out of date.
             HTMLInstrumentation.scanDocument(this.doc);
@@ -134,6 +136,7 @@ define(function (require, exports, module) {
      * Closes the live document, terminating its connection to the browser.
      */
     LiveHTMLDocument.prototype.close = function () {
+        this.doc.releaseRef();
         this.doc.off("change", this._onChange);
         this.protocol.off("DocumentRelated", this._onRelated);
         this.protocol.off("StylesheetAdded", this._onStylesheetAdded);

LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js

@@ -51,7 +51,8 @@ define(function (require, exports, module) {
 
     var DocumentManager = require("document/DocumentManager"),
         HTMLDOMDiff     = require("language/HTMLDOMDiff"),
-        HTMLSimpleDOM   = require("LiveDevelopment/MultiBrowserImpl/language/HTMLSimpleDOM");
+        HTMLSimpleDOM   = require("LiveDevelopment/MultiBrowserImpl/language/HTMLSimpleDOM"),
+        _               = require("thirdparty/lodash");
 
     var allowIncremental = true;
 
@@ -842,6 +843,20 @@ define(function (require, exports, module) {
         _cachedValues = {};
     }
 
+    function getPositionFromTagId(editor, tagId) {
+        var marks = editor._codeMirror.getAllMarks(),
+            markFound;
+
+        markFound = _.find(marks, function (mark) {
+            return (mark.tagID === tagId);
+        });
+        if (markFound) {
+            return markFound.find().from;
+        }
+        return null;
+
+    }
+
     // private methods
     exports._markText                   = _markText;
     exports._getMarkerAtDocumentPos     = _getMarkerAtDocumentPos;
@@ -851,6 +866,7 @@ define(function (require, exports, module) {
     exports._allowIncremental           = allowIncremental;
     exports._getBrowserDiff             = _getBrowserDiff;
     exports._resetCache                 = _resetCache;
+    exports.getPositionFromTagId        = getPositionFromTagId;
 
     // public API
     exports.scanDocument                = scanDocument;

LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js

@@ -47,7 +47,8 @@ define(function (require, exports, module) {
         RemoteFunctions       = require("text!LiveDevelopment/BrowserScripts/RemoteFunctions.js"),
         EditorManager         = require("editor/EditorManager"),
         LiveDevMultiBrowser   = require("LiveDevelopment/LiveDevMultiBrowser"),
-        HTMLInstrumentation   = require("language/HTMLInstrumentation");
+        HTMLInstrumentation   = require("LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation"),
+        FileViewController    = require("project/FileViewController");
 
     /**
      * @private
@@ -111,10 +112,24 @@ define(function (require, exports, module) {
                 }
             }
         } else if (msg.tagId) {
-            var editor = EditorManager.getActiveEditor(),
-                position = HTMLInstrumentation.getPositionFromTagId(editor, parseInt(msg.tagId, 10));
-            if (position) {
-                editor.setCursorPos(position.line, position.ch, true);
+            const liveDoc = LiveDevMultiBrowser.getCurrentLiveDoc(),
+                editor = EditorManager.getActiveEditor();
+            const liveDocPath = liveDoc ? liveDoc.doc.file.fullPath : null,
+                activeEditorDocPath = editor ? editor.document.file.fullPath : null;
+            function selectInActiveDocument() {
+                const activeFullEditor = EditorManager.getCurrentFullEditor();
+                const masterEditor = activeFullEditor && activeFullEditor.document._masterEditor?
+                    activeFullEditor.document._masterEditor : activeFullEditor;
+                const position = HTMLInstrumentation.getPositionFromTagId(masterEditor, parseInt(msg.tagId, 10));
+                if (position) {
+                    activeFullEditor.setCursorPos(position.line, position.ch, true);
+                }
+            }
+            if(liveDocPath !== activeEditorDocPath) {
+                FileViewController.openAndSelectDocument(liveDocPath, FileViewController.PROJECT_MANAGER)
+                    .done(selectInActiveDocument);
+            } else {
+                selectInActiveDocument();
             }
         } else {
             // enrich received message with clientId

LiveDevelopment/main.js

@@ -138,6 +138,10 @@ define(function main(require, exports, module) {
         }
     }
 
+    function setLivePreviewPinned(urlPinned) {
+        LiveDevImpl.setLivePreviewPinned(urlPinned);
+    }
+
     /** Called on status change */
     function _showStatusChangeReason(reason) {
         // Destroy the previous twipsy (options are not updated otherwise)
@@ -285,4 +289,5 @@ define(function main(require, exports, module) {
     // Export public functions
     exports.openLivePreview = openLivePreview;
     exports.closeLivePreview = closeLivePreview;
+    exports.setLivePreviewPinned = setLivePreviewPinned;
 });