Merge pull request #10522 from sebaslv/fix-for-10516

Attach editor to LiveCSSDocument
adobe · Aug 18, 2016 · 5141df2 · 5141df2
2 parents b1a24ba + 56d139b
commit 5141df2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/LiveDevelopment/LiveDevMultiBrowser.js b/src/LiveDevelopment/LiveDevMultiBrowser.js
@@ -307,7 +307,7 @@ define(function (require, exports, module) {
         docPromise.done(function (doc) {
             if ((_classForDocument(doc) === LiveCSSDocument) &&
                     (!_liveDocument || (doc !== _liveDocument.doc))) {
-                var liveDoc = _createLiveDocument(doc, null, roots);
+                var liveDoc = _createLiveDocument(doc, doc._masterEditor, roots);
                 if (liveDoc) {
                     _server.add(liveDoc);
                     _relatedDocuments[doc.url] = liveDoc;

diff --git a/src/LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument.js b/src/LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument.js
@@ -68,6 +68,9 @@ define(function LiveCSSDocumentModule(require, exports, module) {
 
         this.doc.on("change.LiveCSSDocument", this.onChange);
         this.doc.on("deleted.LiveCSSDocument", this.onDeleted);
+        if (editor) {
+            this._attachToEditor(editor);
+        }
     };
 
     LiveCSSDocument.prototype = Object.create(LiveDocument.prototype);