diff options
author | Jonathan Duran | 2012-06-19 11:37:06 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-19 11:37:06 -0700 |
commit | 8a3fb9c3f9b3497884ec7e898924b13dad1d685a (patch) | |
tree | e016f258efbb9d9fc394ecf3cb501deee216c0bb /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
parent | 53a49f49ce5cd72fbb21e2840bb9622d5952d953 (diff) | |
download | ninja-8a3fb9c3f9b3497884ec7e898924b13dad1d685a.tar.gz |
Fix position tracks collapser to use unique element
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 502c455b..79014ae6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
@@ -17,6 +17,8 @@ | |||
17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
18 | "track_lanes" : {"#" : "track_lanes"}, | 18 | "track_lanes" : {"#" : "track_lanes"}, |
19 | "tween": {"@" : "tween"}, | 19 | "tween": {"@" : "tween"}, |
20 | "positionTracksRepetition" : {"@" : "positionTracksRepetition"}, | ||
21 | "positionPropertyTrack" : {"@" : "positionPropertyTrack"}, | ||
20 | "mainCollapser" : {"@" : "mainCollapser"}, | 22 | "mainCollapser" : {"@" : "mainCollapser"}, |
21 | "positionCollapser" : {"@" : "positionCollapser"}, | 23 | "positionCollapser" : {"@" : "positionCollapser"}, |
22 | "styleCollapser" : {"@" : "styleCollapser"} | 24 | "styleCollapser" : {"@" : "styleCollapser"} |
@@ -81,7 +83,7 @@ | |||
81 | "positionTracksRepetition": { | 83 | "positionTracksRepetition": { |
82 | "prototype": "montage/ui/repetition.reel", | 84 | "prototype": "montage/ui/repetition.reel", |
83 | "properties": { | 85 | "properties": { |
84 | "element": {"#": "content-position-tracks"}, | 86 | "element": {"#": "content_position_tracks"}, |
85 | "isSelectionEnabled" : false | 87 | "isSelectionEnabled" : false |
86 | }, | 88 | }, |
87 | "bindings": { | 89 | "bindings": { |
@@ -95,7 +97,7 @@ | |||
95 | "positionPropertyTrack" : { | 97 | "positionPropertyTrack" : { |
96 | "prototype" : "js/panels/Timeline/PropertyTrack.reel", | 98 | "prototype" : "js/panels/Timeline/PropertyTrack.reel", |
97 | "properties" : { | 99 | "properties" : { |
98 | "element":{"#": "position-track-base"} | 100 | "element":{"#": "position_track_base"} |
99 | }, | 101 | }, |
100 | "bindings" : { | 102 | "bindings" : { |
101 | "propTrackData" : { | 103 | "propTrackData" : { |
@@ -134,8 +136,8 @@ | |||
134 | "positionCollapser" : { | 136 | "positionCollapser" : { |
135 | "prototype" : "js/panels/timeline/Collapser", | 137 | "prototype" : "js/panels/timeline/Collapser", |
136 | "properties" : { | 138 | "properties" : { |
137 | "element" : {"#" : "content-position-tracks"}, | 139 | "element" : {"#" : "content_position_collapser"}, |
138 | "myContent" : {"#":"content-position-tracks"}, | 140 | "myContent" : {"#":"content_position_collapser"}, |
139 | "contentHeight" : 40, | 141 | "contentHeight" : 40, |
140 | "isLabelClickable" : false, | 142 | "isLabelClickable" : false, |
141 | "clicker" : {"#" : "label-position"}, | 143 | "clicker" : {"#" : "label-position"}, |
@@ -194,11 +196,14 @@ | |||
194 | <div class="label-main collapsible-label collapsible-collapsed" data-montage-id="label-main"></div> | 196 | <div class="label-main collapsible-label collapsible-collapsed" data-montage-id="label-main"></div> |
195 | <div class="collapsible-content collapsible-collapsed content-main" data-montage-id="content-main"> | 197 | <div class="collapsible-content collapsible-collapsed content-main" data-montage-id="content-main"> |
196 | <div class="label-position collapsible-label collapsible-collapsed" data-montage-id="label-position"> | 198 | <div class="label-position collapsible-label collapsible-collapsed" data-montage-id="label-position"> |
197 | 199 | ||
198 | </div> | 200 | </div> |
199 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks"> | 201 | <div class="content-position collapsible-content collapsible-collapsed" |
200 | <div data-montage-id="position-track-base"></div> | 202 | data-montage-id="content_position_collapser"> |
201 | </div> | 203 | <div data-montage-id="content_position_tracks"> |
204 | <div data-montage-id="position_track_base"></div> | ||
205 | </div> | ||
206 | </div> | ||
202 | 207 | ||
203 | <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"> | 208 | <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"> |
204 | 209 | ||