handle live preview for docs not in working set

adobe · Jul 31, 2014 · e02e71d · e02e71d
1 parent f6e4521
commit e02e71d
Showing 1 changed file with 71 additions and 22 deletions.
diff --git a/src/LiveDevelopment/Documents/HTMLDocument.js b/src/LiveDevelopment/Documents/HTMLDocument.js
@@ -46,6 +46,7 @@ define(function HTMLDocumentModule(require, exports, module) {
 
     var DocumentManager     = require("document/DocumentManager"),
         DOMAgent            = require("LiveDevelopment/Agents/DOMAgent"),
+        EditorManager       = require("editor/EditorManager"),
         HighlightAgent      = require("LiveDevelopment/Agents/HighlightAgent"),
         HTMLInstrumentation = require("language/HTMLInstrumentation"),
         Inspector           = require("LiveDevelopment/Inspector/Inspector"),
@@ -64,36 +65,26 @@ define(function HTMLDocumentModule(require, exports, module) {
         var self = this;
 
         this.doc = doc;
-        if (!editor) {
-            return;
+        if (this.doc) {
+            this.doc.addRef();
         }
+
         this.editor = editor;
         this._instrumentationEnabled = false;
 
-        // Performance optimization to use closures instead of Function.bind()
-        // to improve responsiveness during cursor movement and keyboard events
-        $(this.editor).on("cursorActivity.HTMLDocument", function (event, editor) {
-            self._onCursorActivity(event, editor);
-        });
-
-        $(this.editor).on("change.HTMLDocument", function (event, editor, change) {
-            self._onChange(event, editor, change);
-        });
+        this.onActiveEditorChange = this.onActiveEditorChange.bind(this);
+        $(EditorManager).on("activeEditorChange", this.onActiveEditorChange);
 
-        // Experimental code
-        if (LiveDevelopment.config.experimental) {
-            $(HighlightAgent).on("highlight.HTMLDocument", function (event, node) {
-                self._onHighlight(event, node);
-            });
-        }
+        // Attach now
+        this.attachToEditor(editor);
     };
 
     /**
      * Enable instrumented HTML
      * @param enabled {boolean} 
      */
     HTMLDocument.prototype.setInstrumentationEnabled = function setInstrumentationEnabled(enabled) {
-        if (enabled && !this._instrumentationEnabled) {
+        if (enabled && !this._instrumentationEnabled && this.editor) {
             HTMLInstrumentation.scanDocument(this.doc);
             HTMLInstrumentation._markText(this.editor);
         }
@@ -115,7 +106,7 @@ define(function HTMLDocumentModule(require, exports, module) {
      */
     HTMLDocument.prototype.getResponseData = function getResponseData(enabled) {
         var body;
-        if (this._instrumentationEnabled) {
+        if (this._instrumentationEnabled && this.editor) {
             body = HTMLInstrumentation.generateInstrumentedHTML(this.editor);
         }
 
@@ -126,11 +117,15 @@ define(function HTMLDocumentModule(require, exports, module) {
 
     /** Close the document */
     HTMLDocument.prototype.close = function close() {
-        if (!this.editor) {
-            return;
+        if (this.editor) {
+            $(this.editor).off(".HTMLDocument");
+        }
+
+        if (this.doc) {
+            this.doc.releaseRef();
         }
 
-        $(this.editor).off(".HTMLDocument");
+        $(EditorManager).off("activeEditorChange", this.onActiveEditorChange);
 
         // Experimental code
         if (LiveDevelopment.config.experimental) {
@@ -139,8 +134,53 @@ define(function HTMLDocumentModule(require, exports, module) {
         }
     };
 
+    /** Attach new editor */
+    HTMLDocument.prototype.attachToEditor = function (editor) {
+        var self = this;
+        this.editor = editor;
+
+        if (this.editor) {
+            // Performance optimization to use closures instead of Function.bind()
+            // to improve responsiveness during cursor movement and keyboard events
+            $(this.editor).on("cursorActivity.HTMLDocument", function (event, editor) {
+                self._onCursorActivity(event, editor);
+            });
+
+            $(this.editor).on("change.HTMLDocument", function (event, editor, change) {
+                self._onChange(event, editor, change);
+            });
+
+            // Experimental code
+            if (LiveDevelopment.config.experimental) {
+                $(HighlightAgent).on("highlight.HTMLDocument", function (event, node) {
+                    self._onHighlight(event, node);
+                });
+            }
+
+            if (this._instrumentationEnabled) {
+                // Update instrumentation for new editor
+                HTMLInstrumentation.scanDocument(this.doc);
+                HTMLInstrumentation._markText(this.editor);
+            }
+        }
+    };
+
+    /** Detach current editor */
+    HTMLDocument.prototype.detachFromEditor = function () {
+        if (this.editor) {
+            HighlightAgent.hide();
+            $(this.editor).off(".HTMLDocument");
+            this._onHighlight();
+            this.editor = null;
+        }
+    };
+
     /** Update the highlight */
     HTMLDocument.prototype.updateHighlight = function () {
+        if (!this.editor) {
+            return;
+        }
+
         var editor = this.editor,
             codeMirror = editor._codeMirror,
             ids = [];
@@ -294,6 +334,15 @@ define(function HTMLDocumentModule(require, exports, module) {
         // }
     };
 
+    /** Triggered when the active editor changes */
+    HTMLDocument.prototype.onActiveEditorChange = function (event, newActive, oldActive) {
+        this.detachFromEditor();
+
+        if (newActive && newActive.document === this.doc) {
+            this.attachToEditor(newActive);
+        }
+    };
+
     /** Triggered by the HighlightAgent to highlight a node in the editor */
     HTMLDocument.prototype._onHighlight = function (event, node) {
         if (!node || !node.location || !this.editor) {