aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorEric Guzman2012-08-20 14:54:44 -0700
committerEric Guzman2012-08-20 14:54:44 -0700
commit1e9d019867ff90840735ec531af5ebec9c7962e6 (patch)
tree887d28987a3113e84c771e264767c9462e9a8844 /js/stage
parenta34663e154af834176b758b6da368f634cd2a6bd (diff)
parent36d692a9fb216f2785a570d13c1beb27360c7305 (diff)
downloadninja-1e9d019867ff90840735ec531af5ebec9c7962e6.tar.gz
Merge branch 'refs/heads/master' into minorFixes_7.1
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/layout.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 5cc8dbea..5e6e8152 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -69,7 +69,7 @@ exports.Layout = Montage.create(Component, {
69 set : function(value) { 69 set : function(value) {
70 if (value !== this._currentDocument) { 70 if (value !== this._currentDocument) {
71 this._currentDocument = value; 71 this._currentDocument = value;
72 if(this._currentDocument && this._currentDocument.currentView === "design") { 72 if(this._currentDocument && (this._currentDocument.currentView === "design" || this._currentDocument.model.currentView.identifier !== "code")) {
73 this.elementsToDraw = Array.prototype.slice.call(this._currentDocument.model.documentRoot.childNodes, 0); 73 this.elementsToDraw = Array.prototype.slice.call(this._currentDocument.model.documentRoot.childNodes, 0);
74 } 74 }
75 } 75 }