diff options
author | Jon Reid | 2012-06-12 16:47:15 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-12 16:47:15 -0700 |
commit | f97e4b6ab1db9fb7de18b2e44c1b0edcf2ba072d (patch) | |
tree | e2750ba885826ce0e1f819c2a4c1655f41308360 /js/panels/Timeline/Span.reel/Span.html | |
parent | 8c55dfcb0a669eef0a3bb406b70868078ef09810 (diff) | |
download | ninja-f97e4b6ab1db9fb7de18b2e44c1b0edcf2ba072d.tar.gz |
Timeline: New popup menu for easing choices.
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
-rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index a1f3afeb..6e643daa 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
@@ -15,8 +15,7 @@ | |||
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "spanspace"}, | 16 | "element": {"#": "spanspace"}, |
17 | "container_easing" : {"#" : "container_easing"}, | 17 | "container_easing" : {"#" : "container_easing"}, |
18 | "easing_choice" : {"#": "easing_choice"}, | 18 | "easing_choice" : {"#": "easing_choice"} |
19 | "easing_choices" : {"#" : "easing_choices"} | ||
20 | } | 19 | } |
21 | } | 20 | } |
22 | 21 | ||
@@ -27,17 +26,10 @@ | |||
27 | 26 | ||
28 | <div data-montage-id="spanspace" class="tween_span"> | 27 | <div data-montage-id="spanspace" class="tween_span"> |
29 | <div class="tween_span_bar"></div> | 28 | <div class="tween_span_bar"></div> |
30 | <div data-montage-id="container_easing" class="container-easing"> | 29 | <div data-montage-id="container_easing" class="container-easing-choice"> |
31 | <div data-montage-id="easing_choice" class="easing-choice"> | 30 | <div data-montage-id="easing_choice" class="easing-choice"> |
32 | ease-out | 31 | ease-out |
33 | </div> | 32 | </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> | 33 | </div> |
42 | </div> | 34 | </div> |
43 | 35 | ||