Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 0640abb2..f0fb1a45 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -111,8 +111,9 @@ exports.Splitter = Montage.create(Component, {
             } else {
                 this.panel.removeEventListener("webkitTransitionEnd", this, false);
             }
-
-            this.application.ninja.stage.resizeCanvases = true;
+            if(this.application.ninja.currentDocument && this.application.ninja.currentDocument.currentView === "design"){
+                this.application.ninja.stage.resizeCanvases = true;
+            }
         }
     },
 
@@ -149,6 +150,7 @@ exports.Splitter = Montage.create(Component, {
                     this.panel.addEventListener("webkitTransitionEnd", this, false);
                 }
                 this._collapsed = true;
+                this.disabled = true;
                 this.needsDraw = true;
             }
         }
@@ -169,6 +171,7 @@ exports.Splitter = Montage.create(Component, {
                 } else {
                     this.panel.addEventListener("webkitTransitionEnd", this, false);
                 }
+                this.disabled = false;
                 this.needsDraw = true;
             }
         }