Merge pull request #3281 from adobe/randy/fix-livedev-tests

Fix Live Dev unit tests due to HTMLDocument refactoring
adobe · Mar 29, 2013 · d2f4bd4 · d2f4bd4
2 parents bcb5f41 + 2feafd9
commit d2f4bd4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/LiveDevelopment/Documents/HTMLDocument.js b/src/LiveDevelopment/Documents/HTMLDocument.js
@@ -54,10 +54,10 @@ define(function HTMLDocumentModule(require, exports, module) {
      * @param Document the source document from Brackets
      */
     var HTMLDocument = function HTMLDocument(doc, editor) {
+        this.doc = doc;
         if (!editor) {
             return;
         }
-        this.doc = doc;
         this.editor = editor;
 
         this.onCursorActivity = this.onCursorActivity.bind(this);
@@ -99,6 +99,9 @@ define(function HTMLDocumentModule(require, exports, module) {
 
     /** Triggered on cursor activity by the editor */
     HTMLDocument.prototype.onCursorActivity = function onCursorActivity(event, editor) {
+        if (!this.editor) {
+            return;
+        }
         var codeMirror = this.editor._codeMirror;
         if (LiveDevelopment.config.experimental && Inspector.config.highlight) {
             var location = codeMirror.indexFromPos(codeMirror.getCursor());
@@ -109,6 +112,9 @@ define(function HTMLDocumentModule(require, exports, module) {
 
     /** Triggered on change by the editor */
     HTMLDocument.prototype.onChange = function onChange(event, editor, change) {
+        if (!this.editor) {
+            return;
+        }
         var codeMirror = this.editor._codeMirror;
         while (change) {
             var from = codeMirror.indexFromPos(change.from);
@@ -121,7 +127,7 @@ define(function HTMLDocumentModule(require, exports, module) {
 
     /** Triggered by the HighlightAgent to highlight a node in the editor */
     HTMLDocument.prototype.onHighlight = function onHighlight(event, node) {
-        if (!node || !node.location) {
+        if (!node || !node.location || !this.editor) {
             if (this._highlight) {
                 this._highlight.clear();
                 delete this._highlight;

diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js
@@ -316,7 +316,11 @@ define(function LiveDevelopment(require, exports, module) {
                     stylesheetDeferred.resolve();
                 })
                 .done(function (doc) {
-                    if (!_liveDocument || (doc !== _liveDocument.doc)) {
+                    // CSSAgent includes containing HTMLDocument in list returned
+                    // from getStyleSheetURLS() (which could be useful for collecting
+                    // embedded style sheets) but we need to filter doc out here.
+                    if ((_classForDocument(doc) === CSSDocument) &&
+                            (!_liveDocument || (doc !== _liveDocument.doc))) {
                         _setDocInfo(doc);
                         var liveDoc = _createDocument(doc);
                         if (liveDoc) {