diff options
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 88c78411..74a7f962 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -586,55 +586,54 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
586 | this._mainCollapser.myContent = this.myContent; | 586 | this._mainCollapser.myContent = this.myContent; |
587 | this._mainCollapser.contentHeight = 60; | 587 | this._mainCollapser.contentHeight = 60; |
588 | this._mainCollapser.isLabelClickable = false; | 588 | this._mainCollapser.isLabelClickable = false; |
589 | this._mainCollapser.element = this.element; | 589 | this._mainCollapser.element = this.myContent; |
590 | this._mainCollapser.isCollapsed = this.isMainCollapsed; | 590 | this._mainCollapser.isCollapsed = this.isMainCollapsed; |
591 | this._mainCollapser.isAnimated = true; | 591 | this._mainCollapser.isAnimated = true; |
592 | this._mainCollapser.labelClickEvent = function () { | 592 | this._mainCollapser.labelClickEvent = function () { |
593 | that.isMainCollapsed = that._mainCollapser.isCollapsed; | 593 | that.isMainCollapsed = that._mainCollapser.isCollapsed; |
594 | }; | 594 | }; |
595 | this._mainCollapser.needsDraw = true; | 595 | //this._mainCollapser.needsDraw = true; |
596 | 596 | ||
597 | this._positionCollapser = Collapser.create(); | 597 | this._positionCollapser = Collapser.create(); |
598 | this._positionCollapser.clicker = this.labelPosition; | 598 | this._positionCollapser.clicker = this.labelPosition; |
599 | this._positionCollapser.myContent = this.contentPosition; | 599 | this._positionCollapser.myContent = this.contentPosition; |
600 | this._positionCollapser.contentHeight = 60; | 600 | this._positionCollapser.contentHeight = 40; |
601 | this._positionCollapser.isLabelClickable = true; | 601 | this._positionCollapser.isLabelClickable = true; |
602 | this._positionCollapser.element = this.element; | 602 | this._positionCollapser.element = this.contentPosition; |
603 | this._positionCollapser.isCollapsed = this.isPositionCollapsed; | 603 | this._positionCollapser.isCollapsed = this.isPositionCollapsed; |
604 | this._positionCollapser.isAnimated = true; | 604 | this._positionCollapser.isAnimated = true; |
605 | this._positionCollapser.labelClickEvent = function () { | 605 | this._positionCollapser.labelClickEvent = function () { |
606 | that.isPositionCollapsed = that._positionCollapser.isCollapsed; | 606 | that.isPositionCollapsed = that._positionCollapser.isCollapsed; |
607 | }; | 607 | }; |
608 | this._positionCollapser.needsDraw = true; | 608 | //this._positionCollapser.needsDraw = true; |
609 | 609 | ||
610 | this._transformCollapser = Collapser.create(); | 610 | this._transformCollapser = Collapser.create(); |
611 | this._transformCollapser.clicker = this.labelTransform; | 611 | this._transformCollapser.clicker = this.labelTransform; |
612 | this._transformCollapser.myContent = this.contentTransform; | 612 | this._transformCollapser.myContent = this.contentTransform; |
613 | this._transformCollapser.contentHeight = 100; | 613 | this._transformCollapser.contentHeight = 100; |
614 | this._transformCollapser.isLabelClickable = false; | 614 | this._transformCollapser.isLabelClickable = false; |
615 | this._transformCollapser.element = this.element; | 615 | this._transformCollapser.element = this.contentTransform; |
616 | this._transformCollapser.isCollapsed = this.isTransformCollapsed; | 616 | this._transformCollapser.isCollapsed = this.isTransformCollapsed; |
617 | this._transformCollapser.isAnimated = true; | 617 | this._transformCollapser.isAnimated = true; |
618 | this._transformCollapser.labelClickEvent = function () { | 618 | this._transformCollapser.labelClickEvent = function () { |
619 | that.isTransformCollapsed = that._transformCollapser.isCollapsed; | 619 | that.isTransformCollapsed = that._transformCollapser.isCollapsed; |
620 | }; | 620 | }; |
621 | this._transformCollapser.needsDraw = true; | 621 | //this._transformCollapser.needsDraw = true; |
622 | 622 | ||
623 | this._styleCollapser = Collapser.create(); | 623 | this._styleCollapser = Collapser.create(); |
624 | this._styleCollapser.clicker = this.labelStyles; | 624 | this._styleCollapser.clicker = this.labelStyles; |
625 | this._styleCollapser.myContent = this.contentStyles; | 625 | this._styleCollapser.myContent = this.contentStyles; |
626 | this._styleCollapser.contentHeight = 20; | 626 | this._styleCollapser.contentHeight = 0; |
627 | this._styleCollapser.isLabelClickable = false; | 627 | this._styleCollapser.isLabelClickable = false; |
628 | this._styleCollapser.element = this.element; | 628 | this._styleCollapser.element = this.contentStyles; |
629 | this._styleCollapser.isCollapsed = this.isStyleCollapsed; | 629 | this._styleCollapser.isCollapsed = this.isStyleCollapsed; |
630 | this._styleCollapser.isAnimated = true; | 630 | this._styleCollapser.isAnimated = true; |
631 | this._styleCollapser.labelClickEvent = function () { | 631 | this._styleCollapser.labelClickEvent = function () { |
632 | that.isStyleCollapsed = that._styleCollapser.isCollapsed; | 632 | that.isStyleCollapsed = that._styleCollapser.isCollapsed; |
633 | }; | 633 | }; |
634 | this._styleCollapser.needsDraw = true; | 634 | //this._styleCollapser.needsDraw = true; |
635 | 635 | ||
636 | // Register event handler for layer events. | 636 | // Register event handler for layer events. |
637 | var that = this; | ||
638 | defaultEventManager.addEventListener("layerEvent", this, false); | 637 | defaultEventManager.addEventListener("layerEvent", this, false); |
639 | 638 | ||
640 | } | 639 | } |