diff options
| author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
| commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
| tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/panels/Timeline/Span.reel/Span.html | |
| parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
| parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
| download | ninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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> |