aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Splitter.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 17:16:21 -0700
committerPushkar Joshi2012-05-31 17:16:21 -0700
commit8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch)
tree19a8af74c58c9ea261f0842f36efdab959be3256 /js/panels/Splitter.js
parenteea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff)
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
downloadninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/panels/Splitter.js')
-rwxr-xr-xjs/panels/Splitter.js7
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, {
111 } else { 111 } else {
112 this.panel.removeEventListener("webkitTransitionEnd", this, false); 112 this.panel.removeEventListener("webkitTransitionEnd", this, false);
113 } 113 }
114 114 if(this.application.ninja.currentDocument && this.application.ninja.currentDocument.currentView === "design"){
115 this.application.ninja.stage.resizeCanvases = true; 115 this.application.ninja.stage.resizeCanvases = true;
116 }
116 } 117 }
117 }, 118 },
118 119
@@ -149,6 +150,7 @@ exports.Splitter = Montage.create(Component, {
149 this.panel.addEventListener("webkitTransitionEnd", this, false); 150 this.panel.addEventListener("webkitTransitionEnd", this, false);
150 } 151 }
151 this._collapsed = true; 152 this._collapsed = true;
153 this.disabled = true;
152 this.needsDraw = true; 154 this.needsDraw = true;
153 } 155 }
154 } 156 }
@@ -169,6 +171,7 @@ exports.Splitter = Montage.create(Component, {
169 } else { 171 } else {
170 this.panel.addEventListener("webkitTransitionEnd", this, false); 172 this.panel.addEventListener("webkitTransitionEnd", this, false);
171 } 173 }
174 this.disabled = false;
172 this.needsDraw = true; 175 this.needsDraw = true;
173 } 176 }
174 } 177 }