diff options
| author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
| commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
| tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
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 | } |