diff options
author | Jonathan Duran | 2012-05-08 13:42:04 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-08 13:42:04 -0700 |
commit | 4f1693b953befabf4495df668f542c7f52270864 (patch) | |
tree | d7d87b0be39d47d55685b0cbc2ddc9db39abc7c7 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
parent | a831e11ef6ae97bbd90c896b5cb6f4306e9001dd (diff) | |
download | ninja-4f1693b953befabf4495df668f542c7f52270864.tar.gz |
Change sub property track arrays
Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens
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 | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index dc32d44d..3f3bf24a 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
@@ -100,26 +100,6 @@ | |||
100 | "element":{"#": "position-track-base"} | 100 | "element":{"#": "position-track-base"} |
101 | } | 101 | } |
102 | }, | 102 | }, |
103 | "transformTracksRepetition": { | ||
104 | "prototype": "montage/ui/repetition.reel", | ||
105 | "properties": { | ||
106 | "element": {"#": "content-transform-tracks"}, | ||
107 | "isSelectionEnabled" : false | ||
108 | }, | ||
109 | "bindings": { | ||
110 | "objects": { | ||
111 | "boundObject": {"@": "owner"}, | ||
112 | "boundObjectPropertyPath": "arrTransformTracks", | ||
113 | "oneway": false | ||
114 | } | ||
115 | } | ||
116 | }, | ||
117 | "transformPropertyTrack" : { | ||
118 | "prototype" : "js/panels/Timeline/PropertyTrack.reel", | ||
119 | "properties" : { | ||
120 | "element":{"#": "transform-track-base"} | ||
121 | } | ||
122 | }, | ||
123 | 103 | ||
124 | "mainCollapser" : { | 104 | "mainCollapser" : { |
125 | "prototype" : "js/panels/timeline/Collapser", | 105 | "prototype" : "js/panels/timeline/Collapser", |
@@ -171,31 +151,6 @@ | |||
171 | } | 151 | } |
172 | }, | 152 | }, |
173 | 153 | ||
174 | "transformCollapser" : { | ||
175 | "prototype" : "js/panels/timeline/Collapser", | ||
176 | "properties" : { | ||
177 | "element" : {"#" : "content-transform-tracks"}, | ||
178 | "myContent" : {"#":"content-transform-tracks"}, | ||
179 | "contentHeight" : 40, | ||
180 | "isLabelClickable" : false, | ||
181 | "clicker" : {"#" : "label-transform"}, | ||
182 | "isCollapsed" : true, | ||
183 | "isAnimated" : true | ||
184 | }, | ||
185 | "bindings" : { | ||
186 | "isToggling" : { | ||
187 | "boundObject" : {"@" : "owner" }, | ||
188 | "boundObjectPropertyPath" : "isTransformCollapsed", | ||
189 | "oneway" : false | ||
190 | }, | ||
191 | "bypassAnimation" : { | ||
192 | "boundObject" : {"@": "owner"}, | ||
193 | "boundObjectPropertyPath" : "bypassAnimation", | ||
194 | "oneway" : false | ||
195 | } | ||
196 | } | ||
197 | }, | ||
198 | |||
199 | "styleCollapser" : { | 154 | "styleCollapser" : { |
200 | "prototype" : "js/panels/timeline/Collapser", | 155 | "prototype" : "js/panels/timeline/Collapser", |
201 | "properties" : { | 156 | "properties" : { |
@@ -239,12 +194,7 @@ | |||
239 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks"> | 194 | <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks"> |
240 | <div data-montage-id="position-track-base"></div> | 195 | <div data-montage-id="position-track-base"></div> |
241 | </div> | 196 | </div> |
242 | <div class="label-transform collapsible-label collapsible-collapsed" data-montage-id="label-transform"> | 197 | |
243 | |||
244 | </div> | ||
245 | <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform-tracks"> | ||
246 | <div data-montage-id="transform-track-base"></div> | ||
247 | </div> | ||
248 | <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"> | 198 | <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"> |
249 | 199 | ||
250 | </div> | 200 | </div> |