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/Span.reel/Span.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/Span.reel/Span.html')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index 8baa141a..6e643daa 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
| @@ -13,7 +13,9 @@ | |||
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype": "js/panels/Timeline/Span.reel", | 14 | "prototype": "js/panels/Timeline/Span.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "spanspace"} | 16 | "element": {"#": "spanspace"}, |
| 17 | "container_easing" : {"#" : "container_easing"}, | ||
| 18 | "easing_choice" : {"#": "easing_choice"} | ||
| 17 | } | 19 | } |
| 18 | } | 20 | } |
| 19 | 21 | ||
| @@ -23,6 +25,12 @@ | |||
| 23 | <body> | 25 | <body> |
| 24 | 26 | ||
| 25 | <div data-montage-id="spanspace" class="tween_span"> | 27 | <div data-montage-id="spanspace" class="tween_span"> |
| 28 | <div class="tween_span_bar"></div> | ||
| 29 | <div data-montage-id="container_easing" class="container-easing-choice"> | ||
| 30 | <div data-montage-id="easing_choice" class="easing-choice"> | ||
| 31 | ease-out | ||
| 32 | </div> | ||
| 33 | </div> | ||
| 26 | </div> | 34 | </div> |
| 27 | 35 | ||
| 28 | </body> | 36 | </body> |