diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 1aa9a725..ae1bcddf 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -32,8 +32,7 @@ | |||
32 | "timetext" : {"#": "time_text"}, | 32 | "timetext" : {"#": "time_text"}, |
33 | "timebar" : {"#": "time_bar"}, | 33 | "timebar" : {"#": "time_bar"}, |
34 | "container_tracks" : {"#" : "container-tracks"}, | 34 | "container_tracks" : {"#" : "container-tracks"}, |
35 | "end_hottext" : {"@" : "endHottext"}, | 35 | "end_hottext" : {"@" : "endHottext"} |
36 | "getme" : {"#" : "getme"} | ||
37 | } | 36 | } |
38 | }, | 37 | }, |
39 | 38 | ||
@@ -117,6 +116,11 @@ | |||
117 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | 116 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", |
118 | "oneway" : false | 117 | "oneway" : false |
119 | }, | 118 | }, |
119 | "bypassAnimation" : { | ||
120 | "boundObject" : {"@" : "repetition1"}, | ||
121 | "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation", | ||
122 | "oneway" : false | ||
123 | }, | ||
120 | "dtextPositionX" : { | 124 | "dtextPositionX" : { |
121 | "boundObject" : {"@" : "repetition1"}, | 125 | "boundObject" : {"@" : "repetition1"}, |
122 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX", | 126 | "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX", |
@@ -165,7 +169,7 @@ | |||
165 | "bindings": { | 169 | "bindings": { |
166 | "objects": { | 170 | "objects": { |
167 | "boundObject": {"@": "owner"}, | 171 | "boundObject": {"@": "owner"}, |
168 | "boundObjectPropertyPath": "arrTracks", | 172 | "boundObjectPropertyPath": "arrLayers", |
169 | "oneway": false | 173 | "oneway": false |
170 | } | 174 | } |
171 | } | 175 | } |
@@ -179,7 +183,7 @@ | |||
179 | "bindings" : { | 183 | "bindings" : { |
180 | "trackID" : { | 184 | "trackID" : { |
181 | "boundObject" : {"@" : "repetition2"}, | 185 | "boundObject" : {"@" : "repetition2"}, |
182 | "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID", | 186 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID", |
183 | "oneway" : false | 187 | "oneway" : false |
184 | }, | 188 | }, |
185 | "tweens" : { | 189 | "tweens" : { |
@@ -232,6 +236,11 @@ | |||
232 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", | 236 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", |
233 | "oneway" : false | 237 | "oneway" : false |
234 | }, | 238 | }, |
239 | "bypassAnimation" : { | ||
240 | "boundObject" : {"@" : "repetition2"}, | ||
241 | "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation", | ||
242 | "oneway" : false | ||
243 | }, | ||
235 | "isStyleCollapsed" : { | 244 | "isStyleCollapsed" : { |
236 | "boundObject" : {"@" : "repetition2"}, | 245 | "boundObject" : {"@" : "repetition2"}, |
237 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | 246 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", |
@@ -285,7 +294,7 @@ | |||
285 | 294 | ||
286 | <div id="user_layers" class="userlayers"> | 295 | <div id="user_layers" class="userlayers"> |
287 | <div id="master_layer" class="masterlayer"> | 296 | <div id="master_layer" class="masterlayer"> |
288 | <div id="getme">Master Layer</div> | 297 | <div>Master Layer</div> |
289 | </div> | 298 | </div> |
290 | <div id="container-layers"> | 299 | <div id="container-layers"> |
291 | <div id="container-layer"></div> | 300 | <div id="container-layer"></div> |