diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/panels/Timeline/Span.reel/Span.html | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index 8baa141a..a1f3afeb 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
| @@ -13,7 +13,10 @@ | |||
| 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"}, | ||
| 19 | "easing_choices" : {"#" : "easing_choices"} | ||
| 17 | } | 20 | } |
| 18 | } | 21 | } |
| 19 | 22 | ||
| @@ -23,6 +26,19 @@ | |||
| 23 | <body> | 26 | <body> |
| 24 | 27 | ||
| 25 | <div data-montage-id="spanspace" class="tween_span"> | 28 | <div data-montage-id="spanspace" class="tween_span"> |
| 29 | <div class="tween_span_bar"></div> | ||
| 30 | <div data-montage-id="container_easing" class="container-easing"> | ||
| 31 | <div data-montage-id="easing_choice" class="easing-choice"> | ||
| 32 | ease-out | ||
| 33 | </div> | ||
| 34 | <ul data-montage-id="easing_choices" class="easing-choices"> | ||
| 35 | <li data-ninja-ease="ease">ease</li> | ||
| 36 | <li data-ninja-ease="ease-out" class="easing-selected">ease-out</li> | ||
| 37 | <li data-ninja-ease="ease-in">ease-in</li> | ||
| 38 | <li data-ninja-ease="ease-in-out">ease-in-out</li> | ||
| 39 | <li data-ninja-ease="linear">linear</li> | ||
| 40 | </ul> | ||
| 41 | </div> | ||
| 26 | </div> | 42 | </div> |
| 27 | 43 | ||
| 28 | </body> | 44 | </body> |