diff options
| author | Jonathan Duran | 2012-02-23 07:37:17 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-23 07:37:17 -0800 |
| commit | b7402018659cf8058d5646c08b2a916492269e33 (patch) | |
| tree | 26ffeeaae45bbaaca9931e747e9532c1831c50fd /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |
| parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
| download | ninja-b7402018659cf8058d5646c08b2a916492269e33.tar.gz | |
Timeline Reset to clean Master branch. Code scrub.
Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.
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 | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index b0d191c2..4808e4d8 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -11,7 +11,8 @@ | |||
| 11 | "properties": { | 11 | "properties": { |
| 12 | "element": {"#": "track"}, | 12 | "element": {"#": "track"}, |
| 13 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 13 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
| 14 | "track_lane": {"#": "track_lanes"} | 14 | "styleTracksRepetition" : {"@" : "styleTracksRepetition"}, |
| 15 | "tween": {"@" : "tween"} | ||
| 15 | } | 16 | } |
| 16 | }, | 17 | }, |
| 17 | 18 | ||
| @@ -37,19 +38,24 @@ | |||
| 37 | "boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition", | 38 | "boundObjectPropertyPath" : "objectAtCurrentIteration.spanPosition", |
| 38 | "oneway" : false | 39 | "oneway" : false |
| 39 | }, | 40 | }, |
| 40 | "timelineTrack" : { | 41 | "keyFrameMillisec" : { |
| 41 | "boundObject" : {"@": "tweenRepetition"}, | 42 | "boundObject" : {"@": "tweenRepetition"}, |
| 42 | "boundObjectPropertyPath" : "objectAtCurrentIteration.timelineTrack", | 43 | "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec", |
| 43 | "oneway" : false | 44 | "oneway" : false |
| 44 | }, | 45 | }, |
| 45 | "keyFrameMillisec" : { | 46 | "tweenID" : { |
| 46 | "boundObject" : {"@": "tweenRepetition"}, | 47 | "boundObject" : {"@": "tweenRepetition"}, |
| 47 | "boundObjectPropertyPath" : "objectAtCurrentIteration.keyFrameMillisec", | 48 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenID", |
| 48 | "oneway" : false | 49 | "oneway" : false |
| 49 | }, | 50 | }, |
| 50 | "keyframeID" : { | 51 | "tweenedProperties" : { |
| 51 | "boundObject" : {"@": "tweenRepetition"}, | 52 | "boundObject" : {"@": "tweenRepetition"}, |
| 52 | "boundObjectPropertyPath" : "objectAtCurrentIteration.keyframeID", | 53 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenedProperties", |
| 54 | "oneway" : false | ||
| 55 | }, | ||
| 56 | "isTweenAnimated" : { | ||
| 57 | "boundObject" : {"@": "tweenRepetition"}, | ||
| 58 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated", | ||
| 53 | "oneway" : false | 59 | "oneway" : false |
| 54 | } | 60 | } |
| 55 | } | 61 | } |
| @@ -69,7 +75,25 @@ | |||
| 69 | "oneway": false | 75 | "oneway": false |
| 70 | } | 76 | } |
| 71 | } | 77 | } |
| 78 | }, | ||
| 79 | |||
| 80 | "styleTrackRepetition": { | ||
| 81 | "module": "montage/ui/repetition.reel", | ||
| 82 | "name": "Repetition", | ||
| 83 | "properties": { | ||
| 84 | "element": {"#": "content-styles"}, | ||
| 85 | "isSelectionEnabled" : false | ||
| 86 | }, | ||
| 87 | "bindings": { | ||
| 88 | "objects": { | ||
| 89 | "boundObject": {"@": "owner"}, | ||
| 90 | "boundObjectPropertyPath": "arrStyleTracks", | ||
| 91 | "oneway": false | ||
| 92 | } | ||
| 93 | } | ||
| 72 | } | 94 | } |
| 95 | |||
| 96 | |||
| 73 | } | 97 | } |
| 74 | </script> | 98 | </script> |
| 75 | </head> | 99 | </head> |
| @@ -102,8 +126,8 @@ | |||
| 102 | <div class="label-styles collapsible-label collapsible-collapsed"> | 126 | <div class="label-styles collapsible-label collapsible-collapsed"> |
| 103 | 127 | ||
| 104 | </div> | 128 | </div> |
| 105 | <div class="content-styles collapsible-content collapsible-collapsed"> | 129 | <div id="content-styles" class="content-styles collapsible-content collapsible-collapsed"> |
| 106 | 130 | <div class="timeline-track"></div> | |
| 107 | </div> | 131 | </div> |
| 108 | </div> | 132 | </div> |
| 109 | </div> | 133 | </div> |