diff options
| author | Nivesh Rajbhandari | 2012-03-01 21:49:44 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-01 21:49:44 -0800 |
| commit | 50058746779f714ed9b0287f49e56c9f0d35593e (patch) | |
| tree | 8bfcb041824bfb492765ff814bf8576847a11436 /js/panels/Timeline | |
| parent | 500426dea0ca95a6b45be8ea8d132cfdb4d2c940 (diff) | |
| parent | ff0a956f33df034e9a009cfcb8999e469456a4b5 (diff) | |
| download | ninja-50058746779f714ed9b0287f49e56c9f0d35593e.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/Timeline')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index d50360e6..e3897bbf 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
| @@ -491,7 +491,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
| 491 | }, | 491 | }, |
| 492 | draw: { | 492 | draw: { |
| 493 | value: function() { | 493 | value: function() { |
| 494 | 494 | ||
| 495 | // Coordinate the collapsers | 495 | // Coordinate the collapsers |
| 496 | if (this.mainCollapser.isCollapsed !== this.isMainCollapsed) { | 496 | if (this.mainCollapser.isCollapsed !== this.isMainCollapsed) { |
| 497 | this.mainCollapser.bypassAnimation = true; | 497 | this.mainCollapser.bypassAnimation = true; |