From 56d139b3d481fe71e74a8aea201ecb99b7a45388 Mon Sep 17 00:00:00 2001 From: Sebastian Salvucci Date: Wed, 4 Feb 2015 15:15:50 -0300 Subject: [PATCH] Attach editor to LiveCSSDocument during creation Fix #10516. Attach editor to LiveCSSDocument during its creation since lack of editor instance makes live highlighting not work when LivePreview session is being started from a CSS document. --- src/LiveDevelopment/LiveDevMultiBrowser.js | 2 +- .../MultiBrowserImpl/documents/LiveCSSDocument.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/LiveDevelopment/LiveDevMultiBrowser.js b/src/LiveDevelopment/LiveDevMultiBrowser.js index 6852ea9118a..4c0cf1463ea 100644 --- a/src/LiveDevelopment/LiveDevMultiBrowser.js +++ b/src/LiveDevelopment/LiveDevMultiBrowser.js @@ -312,7 +312,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 index 87cd58f400d..8153019f7c8 100644 --- a/src/LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument.js +++ b/src/LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument.js @@ -72,6 +72,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);