aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Timeline/EasingMenu.reel/EasingMenu.html
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Timeline/EasingMenu.reel/EasingMenu.html')
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.html38
1 files changed, 19 insertions, 19 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
index dcf35d8f..b02a22c6 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,31 +29,31 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 33 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
34 <link rel="stylesheet" type="text/css" href="css/EasingMenu.css"> 34 <link rel="stylesheet" type="text/css" href="css/EasingMenu.css">
35 <script type="text/montage-serialization"> 35 <script type="text/montage-serialization">
36 { 36 {
37 "owner": { 37 "owner": {
38 "prototype": "js/panels/Timeline/EasingMenu.reel", 38 "prototype": "js/panels/Timeline/EasingMenu.reel",
39 "properties": { 39 "properties": {
40 "element": {"#": "container-easing-menu"} 40 "element": {"#": "container-easing-menu"}
41 41
42 } 42 }
43 } 43 }
44 } 44 }
45 </script> 45 </script>
46 </head> 46 </head>
47 <body> 47 <body>
48 <div data-montage-id="container-easing-menu" class="container-easing-choices"> 48 <div data-montage-id="container-easing-menu" class="container-easing-choices">
49 <ul data-montage-id="easing_choices" class="easing-choices"> 49 <ul data-montage-id="easing_choices" class="easing-choices">
50 <li data-ninja-ease="none">none</li> 50 <li data-ninja-ease="none">none</li>
51 <li data-ninja-ease="ease">ease</li> 51 <li data-ninja-ease="ease">ease</li>
52 <li data-ninja-ease="ease-out">ease-out</li> 52 <li data-ninja-ease="ease-out">ease-out</li>
53 <li data-ninja-ease="ease-in">ease-in</li> 53 <li data-ninja-ease="ease-in">ease-in</li>
54 <li data-ninja-ease="ease-in-out">ease-in-out</li> 54 <li data-ninja-ease="ease-in-out">ease-in-out</li>
55 <li data-ninja-ease="linear">linear</li> 55 <li data-ninja-ease="linear">linear</li>
56 </ul> 56 </ul>
57 </div> 57 </div>
58 </body> 58 </body>
59</html> 59</html>