diff options
| author | Jonathan Duran | 2012-02-23 08:08:30 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-23 08:08:30 -0800 |
| commit | cf671b4855ecca0278128e82459691292a3d3dc9 (patch) | |
| tree | 13a93345dc2427a0403c94ced3dfd5093d146310 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | a712e134ea94b6a21061c1bd272ce15b1f95b986 (diff) | |
| download | ninja-cf671b4855ecca0278128e82459691292a3d3dc9.tar.gz | |
Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTrack component.
Cherry pick commit from jreid/Timeline-jreid
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 | 60 |
1 files changed, 49 insertions, 11 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 4808e4d8..cabd92c0 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -91,7 +91,51 @@ | |||
| 91 | "oneway": false | 91 | "oneway": false |
| 92 | } | 92 | } |
| 93 | } | 93 | } |
| 94 | } | 94 | }, |
| 95 | "positionTracksRepetition": { | ||
| 96 | "module": "montage/ui/repetition.reel", | ||
| 97 | "name": "Repetition", | ||
| 98 | "properties": { | ||
| 99 | "element": {"#": "content-position-tracks"}, | ||
| 100 | "isSelectionEnabled" : false | ||
| 101 | }, | ||
| 102 | "bindings": { | ||
| 103 | "objects": { | ||
| 104 | "boundObject": {"@": "owner"}, | ||
| 105 | "boundObjectPropertyPath": "arrPositionTracks", | ||
| 106 | "oneway": false | ||
| 107 | } | ||
| 108 | } | ||
| 109 | }, | ||
| 110 | "positionPropertyTrack" : { | ||
| 111 | "module" : "js/panels/Timeline/PropertyTrack.reel", | ||
| 112 | "name" : "PropertyTrack", | ||
| 113 | "properties" : { | ||
| 114 | "element":{"#": "position-track-base"} | ||
| 115 | } | ||
| 116 | }, | ||
| 117 | "transformTracksRepetition": { | ||
| 118 | "module": "montage/ui/repetition.reel", | ||
| 119 | "name": "Repetition", | ||
| 120 | "properties": { | ||
| 121 | "element": {"#": "content-transform-tracks"}, | ||
| 122 | "isSelectionEnabled" : false | ||
| 123 | }, | ||
| 124 | "bindings": { | ||
| 125 | "objects": { | ||
| 126 | "boundObject": {"@": "owner"}, | ||
| 127 | "boundObjectPropertyPath": "arrTransformTracks", | ||
| 128 | "oneway": false | ||
| 129 | } | ||
| 130 | } | ||
| 131 | }, | ||
| 132 | "transformPropertyTrack" : { | ||
| 133 | "module" : "js/panels/Timeline/PropertyTrack.reel", | ||
| 134 | "name" : "PropertyTrack", | ||
| 135 | "properties" : { | ||
| 136 | "element":{"#": "transform-track-base"} | ||
| 137 | } | ||
| 138 | } | ||
| 95 | 139 | ||
| 96 | 140 | ||
| 97 | } | 141 | } |
| @@ -108,20 +152,14 @@ | |||
| 108 | <div class="label-position collapsible-label collapsible-collapsed"> | 152 | <div class="label-position collapsible-label collapsible-collapsed"> |
| 109 | 153 | ||
| 110 | </div> | 154 | </div> |
| 111 | <div class="content-position collapsible-content collapsible-collapsed"> | 155 | <div class="content-position collapsible-content collapsible-collapsed" id="content-position-tracks"> |
| 112 | <div class="timeline-track"></div> | 156 | <div id="position-track-base"></div> |
| 113 | <div class="timeline-track"></div> | ||
| 114 | <div class="timeline-track"></div> | ||
| 115 | </div> | 157 | </div> |
| 116 | <div class="label-transform collapsible-label collapsible-collapsed"> | 158 | <div class="label-transform collapsible-label collapsible-collapsed"> |
| 117 | 159 | ||
| 118 | </div> | 160 | </div> |
| 119 | <div class="content-transform collapsible-content collapsible-collapsed"> | 161 | <div class="content-transform collapsible-content collapsible-collapsed" id="content-transform-tracks"> |
| 120 | <div class="timeline-track"></div> | 162 | <div id="transform-track-base"></div> |
| 121 | <div class="timeline-track"></div> | ||
| 122 | <div class="timeline-track"></div> | ||
| 123 | <div class="timeline-track"></div> | ||
| 124 | <div class="timeline-track"></div> | ||
| 125 | </div> | 163 | </div> |
| 126 | <div class="label-styles collapsible-label collapsible-collapsed"> | 164 | <div class="label-styles collapsible-label collapsible-collapsed"> |
| 127 | 165 | ||