diff options
| author | Valerio Virgillito | 2012-03-01 17:00:24 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-01 17:00:24 -0800 |
| commit | dd981ba7fcd85ebf2dc2d6bf539fdb37eeacd556 (patch) | |
| tree | f574978953d7813886adee2b6445c549e1093908 /js/panels/Timeline/Layer.reel/Layer.js | |
| parent | 5243824bdc19fc05eccfb6b594b42788f24b3c9d (diff) | |
| parent | 42d78d11764dca5df6c7d01f3221f398bee17152 (diff) | |
| download | ninja-dd981ba7fcd85ebf2dc2d6bf539fdb37eeacd556.tar.gz | |
Merge branch 'refs/heads/master' into stage-fixes
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
| -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; |