Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Fix live highlight when starting from a CSSDocument #8157

Merged
merged 4 commits into from
Jun 26, 2014
Merged

Fix live highlight when starting from a CSSDocument #8157

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c893f57
Fix live highlight when starting from a CSSDocument
Jun 17, 2014
a9bfc6b
Nicer fix
Jun 18, 2014
b7ec826
Merge remote-tracking branch 'upstream/master' into live-preview-css-doc
Jun 26, 2014
0f1d76d
Easier notation
Jun 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/LiveDevelopment/LiveDevelopment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1467,4 +1469,4 @@ define(function LiveDevelopment(require, exports, module) {
exports.init = init;
exports.getCurrentProjectServerConfig = getCurrentProjectServerConfig;
exports.getServerBaseUrl = getServerBaseUrl;
});
});