diff options
| author | Valerio Virgillito | 2012-06-20 21:56:18 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-20 21:56:18 -0700 |
| commit | c8fc6d15e1570e89243abe527cd149e354f7e11f (patch) | |
| tree | f648fa7842f3dc6011da08aaab0bedb445d43b58 /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |
| parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
| parent | 58bca4771ab1e043cd5c11239c1936a022080096 (diff) | |
| download | ninja-c8fc6d15e1570e89243abe527cd149e354f7e11f.tar.gz | |
Merge pull request #316 from imix23ways/Timeline-merge-candidate
Timeline merge candidate
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html')
| -rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index a4b598c5..9c4160c8 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |||
| @@ -13,16 +13,50 @@ | |||
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype": "js/panels/Timeline/PropertyTrack.reel", | 14 | "prototype": "js/panels/Timeline/PropertyTrack.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "property-track"} | 16 | "element": {"#": "property-track"}, |
| 17 | "propTweenRepetition" : {"@" : "propTweenRepetition"}, | ||
| 18 | "propTween": {"@" : "propTween"} | ||
| 17 | } | 19 | } |
| 18 | } | 20 | }, |
| 21 | |||
| 22 | "propTween" : { | ||
| 23 | "prototype" : "js/panels/timeline/Tween.reel", | ||
| 24 | "properties" : { | ||
| 25 | "element":{"#": "prop_track_lane"} | ||
| 26 | }, | ||
| 27 | "bindings" : { | ||
| 28 | "tweenData" : { | ||
| 29 | "boundObject" : {"@": "propTweenRepetition"}, | ||
| 30 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData", | ||
| 31 | "oneway" : false | ||
| 32 | } | ||
| 33 | } | ||
| 34 | }, | ||
| 19 | 35 | ||
| 36 | "propTweenRepetition": { | ||
| 37 | "prototype": "montage/ui/repetition.reel", | ||
| 38 | "properties": { | ||
| 39 | "element": {"#": "prop_track_lanes"}, | ||
| 40 | "isSelectionEnabled" : false | ||
| 41 | }, | ||
| 42 | "bindings": { | ||
| 43 | "objects": { | ||
| 44 | "boundObject": {"@": "owner"}, | ||
| 45 | "boundObjectPropertyPath": "propTweens", | ||
| 46 | "oneway": false | ||
| 47 | } | ||
| 48 | } | ||
| 49 | } | ||
| 20 | } | 50 | } |
| 21 | </script> | 51 | </script> |
| 22 | </head> | 52 | </head> |
| 23 | <body> | 53 | <body> |
| 24 | 54 | ||
| 25 | <div data-montage-id="property-track" class="timeline-track"></div> | 55 | <div data-montage-id="property-track" class="timeline-track"> |
| 56 | <div data-montage-id="prop_track_lanes" class="prop-track"> | ||
| 57 | <div data-montage-id="prop_track_lane"></div> | ||
| 58 | </div> | ||
| 59 | </div> | ||
| 26 | 60 | ||
| 27 | </body> | 61 | </body> |
| 28 | </html> \ No newline at end of file | 62 | </html> \ No newline at end of file |