diff options
author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/panels/Timeline/EasingMenu.reel/EasingMenu.html | |
parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
download | ninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/EasingMenu.reel/EasingMenu.html')
-rw-r--r-- | js/panels/Timeline/EasingMenu.reel/EasingMenu.html | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html new file mode 100644 index 00000000..1c8f808f --- /dev/null +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html | |||
@@ -0,0 +1,35 @@ | |||
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/EasingMenu.css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "owner": { | ||
14 | "prototype": "js/panels/Timeline/EasingMenu.reel", | ||
15 | "properties": { | ||
16 | "element": {"#": "container-easing-menu"} | ||
17 | |||
18 | } | ||
19 | } | ||
20 | } | ||
21 | </script> | ||
22 | </head> | ||
23 | <body> | ||
24 | <div data-montage-id="container-easing-menu" class="container-easing-choices"> | ||
25 | <ul data-montage-id="easing_choices" class="easing-choices"> | ||
26 | <li data-ninja-ease="none">none</li> | ||
27 | <li data-ninja-ease="ease">ease</li> | ||
28 | <li data-ninja-ease="ease-out">ease-out</li> | ||
29 | <li data-ninja-ease="ease-in">ease-in</li> | ||
30 | <li data-ninja-ease="ease-in-out">ease-in-out</li> | ||
31 | <li data-ninja-ease="linear">linear</li> | ||
32 | </ul> | ||
33 | </div> | ||
34 | </body> | ||
35 | </html> \ No newline at end of file | ||