diff options
| author | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
| commit | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch) | |
| tree | 657d55ad394de168dd627cf89b875906d10584e2 /js/panels/Timeline/Span.reel/Span.html | |
| parent | d764428023d87446fbbb153d8e04a23b900d71d5 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index e36a25d6..f7e05982 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 2 | <html lang="en"> | 7 | <html lang="en"> |
| 3 | <head> | 8 | <head> |
| 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| @@ -9,8 +14,7 @@ | |||
| 9 | "module": "js/panels/Timeline/Span.reel", | 14 | "module": "js/panels/Timeline/Span.reel", |
| 10 | "name": "Span", | 15 | "name": "Span", |
| 11 | "properties": { | 16 | "properties": { |
| 12 | "element": {"#": "spanspace"}, | 17 | "element": {"#": "spanspace"} |
| 13 | "tweenspan": {"#": "tweenspan"} | ||
| 14 | } | 18 | } |
| 15 | } | 19 | } |
| 16 | 20 | ||
| @@ -19,8 +23,7 @@ | |||
| 19 | </head> | 23 | </head> |
| 20 | <body> | 24 | <body> |
| 21 | 25 | ||
| 22 | <div id="spanspace"> | 26 | <div id="spanspace" class="tween_span"> |
| 23 | <div id="tweenspan" class="tween_span"></div> | ||
| 24 | </div> | 27 | </div> |
| 25 | 28 | ||
| 26 | </body> | 29 | </body> |