aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJonathan Duran2012-03-01 20:01:36 -0800
committerJonathan Duran2012-03-01 20:01:36 -0800
commitb8fad971d8cf82cdc182160aa72d0c8e69800f76 (patch)
treee7791aacc4b4d59127600ad3e99bbb042b6506b0 /js/panels/Timeline
parent28befbc159399f70f00034f52e56a60dae0a3ba1 (diff)
parentff0a956f33df034e9a009cfcb8999e469456a4b5 (diff)
downloadninja-b8fad971d8cf82cdc182160aa72d0c8e69800f76.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js2
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 94d1f7e9..e76b8cc0 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;