diff options
author | Pushkar Joshi | 2012-03-14 15:39:59 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-14 15:39:59 -0700 |
commit | 571ed9ef856780eded3ac7104ed0ce72c7c7c81c (patch) | |
tree | fc7bdcd86b2eb742f4cda2ccdee6bd599b1f382e /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
parent | 23baa44e0bc7bfb24e42702c1ef58bf62da083d8 (diff) | |
parent | 089534a80c64226bf7d124ab9147afce386fdb5c (diff) | |
download | ninja-571ed9ef856780eded3ac7104ed0ce72c7c7c81c.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 1cc05f4e..7e9b8a21 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
@@ -32,44 +32,9 @@ | |||
32 | "element":{"#": "track_lane"} | 32 | "element":{"#": "track_lane"} |
33 | }, | 33 | }, |
34 | "bindings" : { | 34 | "bindings" : { |
35 | "spanWidth" : { | 35 | "tweenData" : { |
36 | "boundObject" : {"@": "tweenRepetition"}, | 36 | "boundObject" : {"@": "tweenRepetition"}, |
37 | "boundObjectPropertyPath" : "objectAtCurrentIteration.spanWidth", | 37 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData", |
38 | "oneway" : false | ||
39 | }, | ||
40 | "keyFramePosition" : { | ||
41 | "boundObject" : {"@": "tweenRepetition"}, | ||
42 | "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFramePosition", | ||
43 | "oneway" : false | ||
44 | }, | ||
45 | "spanPosition" : { | ||
46 | "boundObject" : {"@": "tweenRepetition"}, | ||
47 | "boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition", | ||
48 | "oneway" : false | ||
49 | }, | ||
50 | "keyFrameMillisec" : { | ||
51 | "boundObject" : {"@": "tweenRepetition"}, | ||
52 | "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec", | ||
53 | "oneway" : false | ||
54 | }, | ||
55 | "tweenID" : { | ||
56 | "boundObject" : {"@": "tweenRepetition"}, | ||
57 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenID", | ||
58 | "oneway" : false | ||
59 | }, | ||
60 | "tweenedProperties" : { | ||
61 | "boundObject" : {"@": "tweenRepetition"}, | ||
62 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties", | ||
63 | "oneway" : false | ||
64 | }, | ||
65 | "isTweenAnimated" : { | ||
66 | "boundObject" : {"@": "tweenRepetition"}, | ||
67 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated", | ||
68 | "oneway" : false | ||
69 | }, | ||
70 | "isClearing" : { | ||
71 | "boundObject" : {"@": "tweenRepetition"}, | ||
72 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isClearing", | ||
73 | "oneway" : false | 38 | "oneway" : false |
74 | } | 39 | } |
75 | } | 40 | } |