1 files changed, 27 insertions, 2 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 817220d4..883f1526 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -349,6 +349,9 @@ exports.Stage = Montage.create(Component, {
 
                 //call configure false with the old document on the selected tool to tear down down any temp. stuff
                 this.application.ninja.toolsData.selectedToolInstance._configure(false);
+
+                // Remove the change listener
+                this._currentDocument.removePropertyChangeListener("model.currentViewIdentifier", this, false);
             } else if(this.currentDocument && (this.currentDocument.currentView === "code")) {
                 this.switchedFromCodeDoc = true;   // Switching from code document affects stage's size and scrollbar
             }
@@ -368,6 +371,8 @@ exports.Stage = Montage.create(Component, {
 
                 this.clearAllCanvas();
                 this.initWithDocument();
+
+                this._currentDocument.addPropertyChangeListener("model.currentViewIdentifier", this, false);
             } else {
                 this.collapseAllPanels();
                 this.hideCanvas(true);
@@ -376,6 +381,26 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+    handleDocumentViewChange: {
+        value: function() {
+            if(this.currentDocument.model.currentView.identifier === "design-code") {
+                drawUtils._eltArray.length = 0;
+                drawUtils._planesArray.length = 0;
+                
+                this.collapseAllPanels();
+                this.hideRulers();
+                this.hideCanvas(true);
+            } else {
+                this.restoreAllPanels(true);
+                this.hideCanvas(false);
+                this.showRulers();
+
+                this.clearAllCanvas();
+                this.initWithDocument();
+            }
+        }
+    },
+
     _userPaddingLeft: { value: 0 },
     _userPaddingTop: { value: 0 },
 
@@ -492,8 +517,6 @@ exports.Stage = Montage.create(Component, {
             this.eventManager.addEventListener( "elementChange", this, false);
 
             this.addPropertyChangeListener("currentDocument.model.domContainer", this, true);
-//            this.addPropertyChangeListener("currentDocument.model.domContainer", this);
-
         }
     },
 
@@ -586,6 +609,8 @@ exports.Stage = Montage.create(Component, {
                     drawUtils.drawXZ = false;
                     this.updatedStage = true;
                 }
+            } else if(notification.currentPropertyPath === "model.currentViewIdentifier") {
+                this.handleDocumentViewChange();
             }
             /*
             else if(notification.currentPropertyPath === "currentDocument.model.domContainer") {