diff options
| author | Jon Reid | 2012-03-01 10:38:47 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-03-01 10:38:47 -0800 |
| commit | a725643eba157b3c37d9acd13c6fdd48379bb0df (patch) | |
| tree | 805fb7d8fd917fc35e30af66fcf22145d19b7084 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
| parent | e67000c704e284f4ab9b50c845853988272ce800 (diff) | |
| download | ninja-a725643eba157b3c37d9acd13c6fdd48379bb0df.tar.gz | |
Timeline: Merge. Set collapser heights.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index f8f4f6b8..90b685dc 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
| @@ -626,7 +626,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
| 626 | this._styleCollapser = Collapser.create(); | 626 | this._styleCollapser = Collapser.create(); |
| 627 | this._styleCollapser.clicker = this.labelStyles; | 627 | this._styleCollapser.clicker = this.labelStyles; |
| 628 | this._styleCollapser.myContent = this.contentStyles; | 628 | this._styleCollapser.myContent = this.contentStyles; |
| 629 | this._styleCollapser.contentHeight = 20; | 629 | this._styleCollapser.contentHeight = 0; |
| 630 | this._styleCollapser.isLabelClickable = false; | 630 | this._styleCollapser.isLabelClickable = false; |
| 631 | this._styleCollapser.element = this.element; | 631 | this._styleCollapser.element = this.element; |
| 632 | this._styleCollapser.isCollapsed = this.isStyleCollapsed; | 632 | this._styleCollapser.isCollapsed = this.isStyleCollapsed; |