aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/EasingMenu.reel
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
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')
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.html38
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.js228
-rw-r--r--js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss2
3 files changed, 134 insertions, 134 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>
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
index 6d41afb0..84e1efb1 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
@@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
32 Component = require("montage/ui/component").Component, 32 Component = require("montage/ui/component").Component,
33 Popup = require("montage/ui/popup/popup.reel").Popup; 33 Popup = require("montage/ui/popup/popup.reel").Popup;
34 34
35var EasingMenu = exports.EasingMenu = Montage.create(Component, { 35var EasingMenu = exports.EasingMenu = Montage.create(Component, {
36 36
@@ -38,127 +38,127 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
38 value: true 38 value: true
39 }, 39 },
40 40
41 /* Begin: Models */ 41 /* Begin: Models */
42 42
43 // popup: the initialized component. 43 // popup: the initialized component.
44 _popup: { 44 _popup: {
45 value: null 45 value: null
46 }, 46 },
47 popup: { 47 popup: {
48 get: function() { 48 get: function() {
49 return this._popup; 49 return this._popup;
50 }, 50 },
51 set: function(newVal) { 51 set: function(newVal) {
52 this._popup = newVal 52 this._popup = newVal
53 } 53 }
54 }, 54 },
55 55
56 // callingComponent: pointer to the span that called for the menu 56 // callingComponent: pointer to the span that called for the menu
57 _callingComponent: { 57 _callingComponent: {
58 value: null 58 value: null
59 }, 59 },
60 callingComponent: { 60 callingComponent: {
61 get: function() { 61 get: function() {
62 return this._callingComponent; 62 return this._callingComponent;
63 }, 63 },
64 set: function(newVal) { 64 set: function(newVal) {
65 this._callingComponent = newVal; 65 this._callingComponent = newVal;
66 } 66 }
67 }, 67 },
68 68
69 // anchor: pointer to the anchoring element 69 // anchor: pointer to the anchoring element
70 _anchor: { 70 _anchor: {
71 value: null 71 value: null
72 }, 72 },
73 anchor: { 73 anchor: {
74 get: function() { 74 get: function() {
75 return this._anchor; 75 return this._anchor;
76 }, 76 },
77 set: function(newVal) { 77 set: function(newVal) {
78 this._anchor = newVal; 78 this._anchor = newVal;
79 } 79 }
80 }, 80 },
81 81
82 82
83 _top: { 83 _top: {
84 value: null 84 value: null
85 }, 85 },
86 top: { 86 top: {
87 get: function() { 87 get: function() {
88 return this._top; 88 return this._top;
89 }, 89 },
90 set: function(newVal) { 90 set: function(newVal) {
91 this._top = newVal; 91 this._top = newVal;
92 } 92 }
93 }, 93 },
94 _left: { 94 _left: {
95 value: null 95 value: null
96 }, 96 },
97 left: { 97 left: {
98 get: function() { 98 get: function() {
99 return this._left; 99 return this._left;
100 }, 100 },
101 set: function(newVal) { 101 set: function(newVal) {
102 this._left = newVal; 102 this._left = newVal;
103 } 103 }
104 }, 104 },
105 105
106 // currentChoice: The data attribute of the current choice 106 // currentChoice: The data attribute of the current choice
107 _currentChoice: { 107 _currentChoice: {
108 value: "none" 108 value: "none"
109 }, 109 },
110 currentChoice: { 110 currentChoice: {
111 get: function() { 111 get: function() {
112 return this._currentChoice; 112 return this._currentChoice;
113 }, 113 },
114 set: function(newVal) { 114 set: function(newVal) {
115 this._currentChoice = newVal; 115 this._currentChoice = newVal;
116 } 116 }
117 }, 117 },
118 118
119 _isShown: { 119 _isShown: {
120 value: false 120 value: false
121 }, 121 },
122 122
123 /* End: Models */ 123 /* End: Models */
124 124
125 /* Begin: Draw Cycle */ 125 /* Begin: Draw Cycle */
126 willDraw: { 126 willDraw: {
127