diff options
author | Valerio Virgillito | 2012-05-23 14:11:54 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-23 14:11:54 -0700 |
commit | 6dfd2e7bb01ae4b60845fba858207364aef68f72 (patch) | |
tree | 511e1992e8a856ce2a5b108821c79c87f2a72058 /js/panels/Splitter.js | |
parent | 108764dbdaa0c040de9146c2d722b6e53830cd54 (diff) | |
parent | 26d4cbf0f5c65f60051273f1648a0e8005d8c78a (diff) | |
download | ninja-6dfd2e7bb01ae4b60845fba858207364aef68f72.tar.gz |
Merge pull request #252 from ananyasen/dom-architecture
bug fixes
Diffstat (limited to 'js/panels/Splitter.js')
-rwxr-xr-x | js/panels/Splitter.js | 7 |
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 | } |