diff options
author | John Mayhew | 2012-02-10 16:04:19 -0800 |
---|---|---|
committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/panels/Timeline/Tween.reel/Tween.html | |
parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html new file mode 100644 index 00000000..307dcd02 --- /dev/null +++ b/js/panels/Timeline/Tween.reel/Tween.html | |||
@@ -0,0 +1,48 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <html lang="en"> | ||
3 | <head> | ||
4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
5 | <link rel="stylesheet" type="text/css" href="css/Tween.css"> | ||
6 | <script type="text/montage-serialization"> | ||
7 | { | ||
8 | "owner": { | ||
9 | "module": "js/panels/Timeline/Tween.reel", | ||
10 | "name": "Tween", | ||
11 | "properties": { | ||
12 | "element": {"#": "tweenspace"}, | ||
13 | "keyframe": {"@": "keyframe"}, | ||
14 | "span": {"@": "span"}, | ||
15 | "tweencontainer": {"#": "tweencontainer"} | ||
16 | } | ||
17 | }, | ||
18 | |||
19 | "span": { | ||
20 | "module": "js/panels/Timeline/Span.reel", | ||
21 | "name": "Span", | ||
22 | "properties": { | ||
23 | "element": {"#": "span_container"} | ||
24 | } | ||
25 | }, | ||
26 | |||
27 | "keyframe": { | ||
28 | "module": "js/panels/Timeline/Keyframe.reel", | ||
29 | "name": "Keyframe", | ||
30 | "properties": { | ||
31 | "element": {"#": "keyframe_container"}, | ||
32 | "containingSpan": {"@": "span"} | ||
33 | } | ||
34 | } | ||
35 | } | ||
36 | </script> | ||
37 | </head> | ||
38 | <body> | ||
39 | |||
40 | <div id="tweenspace"> | ||
41 | <div id="tweencontainer" class="tween_container"> | ||
42 | <div id="span_container"></div> | ||
43 | <div id="keyframe_container"></div> | ||
44 | </div> | ||
45 | </div> | ||
46 | |||
47 | </body> | ||
48 | </html> \ No newline at end of file | ||