diff options
| author | Ananya Sen | 2012-06-21 11:07:11 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-21 11:07:11 -0700 |
| commit | 6915d6607f2d768f363baed84287f6593925ae1e (patch) | |
| tree | 306738165c11fab764a27c3e76d93c2e4d86f297 /js/panels/Timeline/Span.reel/Span.html | |
| parent | 8db9e73ca68c006769af3997034959f6b7008add (diff) | |
| parent | c8fc6d15e1570e89243abe527cd149e354f7e11f (diff) | |
| download | ninja-6915d6607f2d768f363baed84287f6593925ae1e.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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> |