diff options
author | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-03-02 12:36:34 -0800 |
commit | dc3c813320c8d3fb837d5d18e70ab35a53b116c1 (patch) | |
tree | da417684de5e302d302ea617854015bd9a8ca17a /js/panels/Timeline/Layer.reel | |
parent | d7d78d4a4e8cf82c56379d25efbe679b3b823abc (diff) | |
parent | 4419209a1fd850ab468209b562b66b0242b42a9c (diff) | |
download | ninja-dc3c813320c8d3fb837d5d18e70ab35a53b116c1.tar.gz |
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index e75b4d0f..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; |
@@ -509,7 +509,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
509 | this.styleCollapser.bypassAnimation = true; | 509 | this.styleCollapser.bypassAnimation = true; |
510 | this.styleCollapser.toggle(); | 510 | this.styleCollapser.toggle(); |
511 | } | 511 | } |
512 | |||
513 | if (this.isSelected) { | 512 | if (this.isSelected) { |
514 | this.element.classList.add("selected"); | 513 | this.element.classList.add("selected"); |
515 | } else { | 514 | } else { |