3 files changed, 51 insertions, 8 deletions

diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js
index b207cc3d..5ad2d364 100755
--- a/js/stage/binding-view.reel/binding-view.js
+++ b/js/stage/binding-view.reel/binding-view.js
@@ -207,22 +207,36 @@ exports.BindingView = Montage.create(Component, {
         }
     },
 
-    _currentDocument : { value: null },
-    currentDocument : {
-        get : function() { return this._currentDocument; },
-        set : function(value) {
-            if(value === this._currentDocument) { return; }
+    _currentDocument: {
+        value: null
+    },
 
+    currentDocument: {
+        get: function() {
+            return this._currentDocument;
+        },
+        set: function(value) {
+            if(value === this._currentDocument) {
+                return;
+            }
 
             this._currentDocument = value;
+
             if(value) {
                 this.hide = (value.currentView === 'code');
+                this.currentDocument.addPropertyChangeListener("model.currentView", this, false);
             }
 
             this.needsDraw = true;
         }
     },
 
+    handleChange: {
+        value: function() {
+            this.hide = this.currentDocument.model.currentView.identifier === "design-code";
+        }
+    },
+
     _hide : { value: true },
     hide : {
         get : function() { return this._hide; },
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index 56b4c58c..d1277ef1 100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
@@ -68,7 +68,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 .codeViewContainer .CodeMirror-scroll {
     height: 100%;
-    overflow: auto;
+    overflow-y: hidden;
+}
+
+.codeViewContainer .CodeMirror-scrollbar {
+    display:none;
 }
 
 .codeViewContainer>div{
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") {