diff options
| author | Valerio Virgillito | 2012-02-09 13:35:15 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-09 13:35:15 -0800 |
| commit | cebd27bd649d01c8b8713651df3878da14b5e9a8 (patch) | |
| tree | 3d20d838f2f6892a07cf16c4c959e234f96ee60b /js/panels/Timeline/Keyframe.reel/Keyframe.html | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| parent | 2092acf520e3f346f15e42c76c2f616e7d094c97 (diff) | |
| download | ninja-cebd27bd649d01c8b8713651df3878da14b5e9a8.tar.gz | |
Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into feature-branch
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.html')
| -rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.html | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html new file mode 100644 index 00000000..bf21994b --- /dev/null +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html | |||
| @@ -0,0 +1,27 @@ | |||
| 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/Keyframe.css"> | ||
| 6 | <script type="text/montage-serialization"> | ||
| 7 | { | ||
| 8 | "owner": { | ||
| 9 | "module": "js/panels/Timeline/Keyframe.reel", | ||
| 10 | "name": "Keyframe", | ||
| 11 | "properties": { | ||
| 12 | "element": {"#": "keyframespace"}, | ||
| 13 | "tweenkeyframe": {"#": "tweenkeyframe"} | ||
| 14 | } | ||
| 15 | } | ||
| 16 | |||
| 17 | } | ||
| 18 | </script> | ||
| 19 | </head> | ||
| 20 | <body> | ||
| 21 | |||
| 22 | <div id="keyframespace"> | ||
| 23 | <div id="tweenkeyframe" class="tween_keyframe"></div> | ||
| 24 | </div> | ||
| 25 | |||
| 26 | </body> | ||
| 27 | </html> \ No newline at end of file | ||