diff options
| author | Jonathan Duran | 2012-05-04 22:32:38 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-04 22:32:38 -0700 |
| commit | 9f71f7804bd649dbfb9078cc0bef562530738e6f (patch) | |
| tree | da5d4aa2f894e840dd044d890e0d0cae6c7c2843 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | eaef072648eb539e648aabf7bc1aea8d02c21085 (diff) | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| download | ninja-9f71f7804bd649dbfb9078cc0bef562530738e6f.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index ed013505..dc32d44d 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | "element": {"#": "track"}, | 16 | "element": {"#": "track"}, |
| 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
| 18 | "styleTracksRepetition" : {"@" : "styleTracksRepetition"}, | 18 | "styleTracksRepetition" : {"@" : "styleTracksRepetition"}, |
| 19 | "track_lanes" : {"#" : "track_lanes"}, | ||
| 19 | "tween": {"@" : "tween"}, | 20 | "tween": {"@" : "tween"}, |
| 20 | "_mainCollapser" : {"@" : "mainCollapser"}, | 21 | "_mainCollapser" : {"@" : "mainCollapser"}, |
| 21 | "_positionCollapser" : {"@" : "positionCollapser"}, | 22 | "_positionCollapser" : {"@" : "positionCollapser"}, |
| @@ -227,7 +228,7 @@ | |||
| 227 | <body> | 228 | <body> |
| 228 | 229 | ||
| 229 | <div data-montage-id="track" class="timeline-track"> | 230 | <div data-montage-id="track" class="timeline-track"> |
| 230 | <div data-montage-id="track_lanes" class="tracklane"> | 231 | <div data-montage-id="track_lanes" class="tracklane" style="position: relative;"> |
| 231 | <div data-montage-id="track_lane"></div> | 232 | <div data-montage-id="track_lane"></div> |
| 232 | </div> | 233 | </div> |
| 233 | <div class="label-main collapsible-label collapsible-collapsed" data-montage-id="label-main"></div> | 234 | <div class="label-main collapsible-label collapsible-collapsed" data-montage-id="label-main"></div> |