diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/Timeline/EasingMenu.reel | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/EasingMenu.reel')
-rw-r--r-- | js/panels/Timeline/EasingMenu.reel/EasingMenu.html | 59 | ||||
-rw-r--r-- | js/panels/Timeline/EasingMenu.reel/EasingMenu.js | 251 | ||||
-rw-r--r-- | js/panels/Timeline/EasingMenu.reel/css/EasingMenu.css | 23 | ||||
-rw-r--r-- | js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss | 25 |
4 files changed, 181 insertions, 177 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html index dcf35d8f..20f2146a 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,31 +30,31 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 31 | </copyright> --> |
31 | <html lang="en"> | 32 | <html lang="en"> |
32 | <head> | 33 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link rel="stylesheet" type="text/css" href="css/EasingMenu.css"> | 35 | <link rel="stylesheet" type="text/css" href="css/EasingMenu.css"> |
35 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
36 | { | 37 | { |
37 | "owner": { | 38 | "owner": { |
38 | "prototype": "js/panels/Timeline/EasingMenu.reel", | 39 | "prototype": "js/panels/Timeline/EasingMenu.reel", |
39 | "properties": { | 40 | "properties": { |
40 | "element": {"#": "container-easing-menu"} | 41 | "element": {"#": "container-easing-menu"} |
41 | 42 | ||
42 | } | 43 | } |
43 | } | 44 | } |
44 | } | 45 | } |
45 | </script> | 46 | </script> |
46 | </head> | 47 | </head> |
47 | <body> | 48 | <body> |
48 | <div data-montage-id="container-easing-menu" class="container-easing-choices"> | 49 | <div data-montage-id="container-easing-menu" class="container-easing-choices"> |
49 | <ul data-montage-id="easing_choices" class="easing-choices"> | 50 | <ul data-montage-id="easing_choices" class="easing-choices"> |
50 | <li data-ninja-ease="none">none</li> | 51 | <li data-ninja-ease="none">none</li> |
51 | <li data-ninja-ease="ease">ease</li> | 52 | <li data-ninja-ease="ease">ease</li> |
52 | <li data-ninja-ease="ease-out">ease-out</li> | 53 | <li data-ninja-ease="ease-out">ease-out</li> |
53 | <li data-ninja-ease="ease-in">ease-in</li> | 54 | <li data-ninja-ease="ease-in">ease-in</li> |
54 | <li data-ninja-ease="ease-in-out">ease-in-out</li> | 55 | <li data-ninja-ease="ease-in-out">ease-in-out</li> |
55 | <li data-ninja-ease="linear">linear</li> | 56 | <li data-ninja-ease="linear">linear</li> |
56 | </ul> | 57 | </ul> |
57 | </div> | 58 | </div> |
58 | </body> | 59 | </body> |
59 | </html> | 60 | </html> |
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js index 6d41afb0..7712e3bb 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
29 | </copyright> */ | 30 | </copyright> */ |
30 | 31 | ||
31 | var Montage = require("montage/core/core").Montage, | 32 | var Montage = require("montage/core/core").Montage, |
32 | Component = require("montage/ui/component").Component, | 33 | Component = require("montage/ui/component").Component, |
33 | Popup = require("montage/ui/popup/popup.reel").Popup; | 34 | Popup = require("montage/ui/popup/popup.reel").Popup; |
34 | 35 | ||
35 | var EasingMenu = exports.EasingMenu = Montage.create(Component, { | 36 | var EasingMenu = exports.EasingMenu = Montage.create(Component, { |
36 | 37 | ||
@@ -38,127 +39,127 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, { | |||
38 | value: true | 39 | value: true |
39 | }, | 40 | }, |
40 | 41 | ||
41 | /* Begin: Models */ | 42 | /* Begin: Models */ |
42 | 43 | ||
43 | // popup: the initialized component. | 44 | // popup: the initialized component. |
44 | _popup: { | 45 | _popup: { |
45 | value: null | 46 | value: null |
46 | }, | 47 | }, |
47 | popup: { | 48 | popup: { |
48 | get: function() { | 49 | get: function() { |
49 | return this._popup; | 50 | return this._popup; |
50 | }, | 51 | }, |
51 | set: function(newVal) { | 52 | set: function(newVal) { |
52 | this._popup = newVal | 53 | this._popup = newVal |
53 | } | 54 | } |
54 | }, | 55 | }, |
55 | 56 | ||
56 | // callingComponent: pointer to the span that called for the menu | 57 | // callingComponent: pointer to the span that called for the menu |
57 | _callingComponent: { | 58 | _callingComponent: { |
58 | value: null | 59 | value: null |
59 | }, | 60 | }, |
60 | callingComponent: { | 61 | callingComponent: { |
61 | get: function() { | 62 | get: function() { |
62 | return this._callingComponent; | 63 | return this._callingComponent; |
63 | }, | 64 | }, |
64 | set: function(newVal) { | 65 | set: function(newVal) { |
65 | this._callingComponent = newVal; | 66 | this._callingComponent = newVal; |
66 | } | 67 | } |
67 | }, | 68 | }, |
68 | 69 | ||
69 | // anchor: pointer to the anchoring element | 70 | // anchor: pointer to the anchoring element |
70 | _anchor: { |