aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-01 18:13:18 -0800
committerJose Antonio Marquez2012-03-01 18:13:18 -0800
commit66bc1f46938afc696b11878ebbb97d1fd361386e (patch)
treea4e8d066bf80a43f42ce971a3ca05ab88f457d16 /js/panels/Timeline/Layer.reel
parent80ac930684255dd24cecae70b488285a6058488e (diff)
parent61dd921d5bb06ab47ee84506dbaaeaf4895ebf42 (diff)
downloadninja-66bc1f46938afc696b11878ebbb97d1fd361386e.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-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 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;