aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Span.reel/Span.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 09:55:35 -0700
committerJose Antonio Marquez2012-06-21 09:55:35 -0700
commit28aa1276ffb6cefca7f7d58906cf8380fc6253eb (patch)
treec9a4a6f5d18693c39fbc668567125211151c9213 /js/panels/Timeline/Span.reel/Span.html
parent4eff115126ab946c5852d787fd596e07b156c9a5 (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-28aa1276ffb6cefca7f7d58906cf8380fc6253eb.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
-rw-r--r--js/panels/Timeline/Span.reel/Span.html10
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>