From c893f57903f61535fe17d146bf40f4f80b9c173e Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 18 Jun 2014 01:22:59 +0200 Subject: [PATCH 1/3] Fix live highlight when starting from a CSSDocument --- src/LiveDevelopment/LiveDevelopment.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index bfc0d09e6e6..37c96e4c261 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -485,7 +485,11 @@ define(function LiveDevelopment(require, exports, module) { docPromise.done(function (doc) { if ((_classForDocument(doc) === CSSDocument) && (!_liveDocument || (doc !== _liveDocument.doc))) { - var liveDoc = _createDocument(doc); + var editor = EditorManager.getActiveEditor(); + if (!editor || editor.document !== doc) { + editor = undefined; + } + var liveDoc = _createDocument(doc, editor); if (liveDoc) { _server.add(liveDoc); _relatedDocuments[doc.url] = liveDoc; @@ -1461,4 +1465,4 @@ define(function LiveDevelopment(require, exports, module) { exports.init = init; exports.getCurrentProjectServerConfig = getCurrentProjectServerConfig; exports.getServerBaseUrl = getServerBaseUrl; -}); \ No newline at end of file +}); From a9bfc6b195a8b9001578ce176474ca133b1c0821 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Wed, 18 Jun 2014 23:48:30 +0200 Subject: [PATCH 2/3] Nicer fix --- src/LiveDevelopment/LiveDevelopment.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index 37c96e4c261..f0e0c0ce1d7 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -485,11 +485,9 @@ define(function LiveDevelopment(require, exports, module) { docPromise.done(function (doc) { if ((_classForDocument(doc) === CSSDocument) && (!_liveDocument || (doc !== _liveDocument.doc))) { - var editor = EditorManager.getActiveEditor(); - if (!editor || editor.document !== doc) { - editor = undefined; - } - var liveDoc = _createDocument(doc, editor); + // 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 || undefined); if (liveDoc) { _server.add(liveDoc); _relatedDocuments[doc.url] = liveDoc; From 0f1d76d86ea18ce2cd77ef0dcd263aa95a69c328 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 26 Jun 2014 21:20:55 +0200 Subject: [PATCH 3/3] Easier notation --- src/LiveDevelopment/LiveDevelopment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js index fb12a81232f..3ef3d82f76c 100644 --- a/src/LiveDevelopment/LiveDevelopment.js +++ b/src/LiveDevelopment/LiveDevelopment.js @@ -487,7 +487,7 @@ define(function LiveDevelopment(require, exports, module) { (!_liveDocument || (doc !== _liveDocument.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 || undefined); + var liveDoc = _createDocument(doc, doc._masterEditor); if (liveDoc) { _server.add(liveDoc); _relatedDocuments[doc.url] = liveDoc;