diff options
author | Jonathan Duran | 2012-07-20 08:30:24 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-20 08:30:24 -0700 |
commit | 936fbd6d76d35e3f9574983682c266de6dce55f7 (patch) | |
tree | edfbd366df9d7e7514425561a817fc2c67f398d9 /js/panels/Splitter.js | |
parent | 7b7f4157dfd1d3ad2b4a266c92594da56a619254 (diff) | |
parent | 9053e2037821a5c8405fabb74db9635deacfe8d5 (diff) | |
download | ninja-936fbd6d76d35e3f9574983682c266de6dce55f7.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Splitter.js')
-rwxr-xr-x | js/panels/Splitter.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index 39e51901..0e7a4e68 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -111,6 +111,8 @@ exports.Splitter = Montage.create(Component, { | |||
111 | else this.panel.classList.remove("collapsed"); | 111 | else this.panel.classList.remove("collapsed"); |
112 | this.element.classList.remove("collapsed"); | 112 | this.element.classList.remove("collapsed"); |
113 | if(this._resizeBar != null) this.resizeBar.classList.remove("collapsed"); | 113 | if(this._resizeBar != null) this.resizeBar.classList.remove("collapsed"); |
114 | // webkitTransitionEnd is not fired when expanded, so force draw here. | ||
115 | this.application.ninja.stage.resizeCanvases = true; | ||
114 | } | 116 | } |
115 | } | 117 | } |
116 | }, | 118 | }, |