Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 6 insertions, 4 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index de4c67c1..8a53a08b 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -65,8 +65,9 @@ exports.Layout = Montage.create(Component, {
     handleOpenDocument: {
         value: function() {
             // Initial elements to draw is the entire node list
-            this.elementsToDraw = this.application.ninja.documentController.activeDocument._liveNodeList;
-
+            if(this.application.ninja.documentController.activeDocument.currentView === "design"){//only for designer view
+                this.elementsToDraw = this.application.ninja.documentController.activeDocument._liveNodeList;
+            }
             // Draw the elements and the 3d info
             this.draw();
             this.draw3DInfo(false);
@@ -104,8 +105,9 @@ exports.Layout = Montage.create(Component, {
             }
 
             // Make an array copy of the line node list which is not an array like object
-            this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);
-
+            if(this.application.ninja.documentController.activeDocument.currentView === "design"){//only for designer view
+                this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);
+            }
             // Clear the elements to draw
             this.elementsToDraw.length = 0;