Merge pull request #8157 from SAPlayer/live-preview-css-doc

Fix live highlight when starting from a CSSDocument
adobe · Jun 26, 2014 · 790b3f2 · 790b3f2
2 parents f5fd5fa + 0f1d76d
commit 790b3f2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js
@@ -485,7 +485,9 @@ define(function LiveDevelopment(require, exports, module) {
         docPromise.done(function (doc) {
             if ((_classForDocument(doc) === CSSDocument) &&
                     (!_liveDocument || (doc !== _liveDocument.doc))) {
-                var liveDoc = _createDocument(doc);
+                // The doc may already have an editor (e.g. starting live preview from an css file),
+                // so pass the editor if any
+                var liveDoc = _createDocument(doc, doc._masterEditor);
                 if (liveDoc) {
                     _server.add(liveDoc);
                     _relatedDocuments[doc.url] = liveDoc;
@@ -1467,4 +1469,4 @@ define(function LiveDevelopment(require, exports, module) {
     exports.init                = init;
     exports.getCurrentProjectServerConfig = getCurrentProjectServerConfig;
     exports.getServerBaseUrl    = getServerBaseUrl;
-});
+});