diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/panels/Timeline/Tween.reel/Tween.html | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.html')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 49 |
1 files changed, 49 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..ce51cb70 --- /dev/null +++ b/js/panels/Timeline/Tween.reel/Tween.html | |||
@@ -0,0 +1,49 @@ | |||
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> --> | ||
7 | <html lang="en"> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" type="text/css" href="css/Tween.css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "owner": { | ||
14 | "module": "js/panels/Timeline/Tween.reel", | ||
15 | "name": "Tween", | ||
16 | "properties": { | ||
17 | "element": {"#": "tweenspace"}, | ||
18 | "keyframe": {"@": "keyframe"}, | ||
19 | "tweenspan": {"@": "span"} | ||
20 | } | ||
21 | }, | ||
22 | |||
23 | "span": { | ||
24 | "module": "js/panels/Timeline/Span.reel", | ||
25 | "name": "Span", | ||
26 | "properties": { | ||
27 | "element": {"#": "span_container"} | ||
28 | } | ||
29 | }, | ||
30 | |||
31 | "keyframe": { | ||
32 | "module": "js/panels/Timeline/Keyframe.reel", | ||
33 | "name": "Keyframe", | ||
34 | "properties": { | ||
35 | "element": {"#": "keyframe_container"} | ||
36 | } | ||
37 | } | ||
38 | } | ||
39 | </script> | ||
40 | </head> | ||
41 | <body> | ||
42 | |||
43 | <div id="tweenspace" class="tween_container"> | ||
44 | <div id="span_container"></div> | ||
45 | <div id="keyframe_container"></div> | ||
46 | </div> | ||
47 | |||
48 | </body> | ||
49 | </html> \ No newline at end of file | ||