diff options
author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Timeline/Tween.reel | |
parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 37 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 95 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/css/Tween.css | 23 |
3 files changed, 79 insertions, 76 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index e27aeb89..78178e65 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.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,9 +30,9 @@ 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/Tween.css"> | 35 | <link rel="stylesheet" type="text/css" href="css/Tween.css"> |
35 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
36 | { | 37 | { |
37 | "owner": { | 38 | "owner": { |
@@ -42,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
42 | "tweenspan": {"@": "span"} | 43 | "tweenspan": {"@": "span"} |
43 | } | 44 | } |
44 | }, | 45 | }, |
45 | 46 | ||
46 | "span": { | 47 | "span": { |
47 | "prototype": "js/panels/Timeline/Span.reel", | 48 | "prototype": "js/panels/Timeline/Span.reel", |
48 | "properties": { | 49 | "properties": { |
@@ -58,8 +59,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
58 | } | 59 | } |
59 | } | 60 | } |
60 | </script> | 61 | </script> |
61 | </head> | 62 | </head> |
62 | <body> | 63 | <body> |
63 | 64 | ||
64 | <div data-montage-id="tweenspace" class="tween_container"> | 65 | <div data-montage-id="tweenspace" class="tween_container"> |
65 | <div data-montage-id="span_container"></div> | 66 | <div data-montage-id="span_container"></div> |
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index ff8d0bad..ad022fa9 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.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 |
@@ -165,38 +166,38 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
165 | this._isTweenAnimated = value; | 166 | this._isTweenAnimated = value; |
166 | } | 167 | } |
167 | }, | 168 | }, |
168 | 169 | ||
169 | _isDragging: { | 170 | _isDragging: { |
170 | value: false | 171 | value: false |
171 | }, | 172 | }, |
172 | isDragging: { | 173 | isDragging: { |
173 | serializable: true, | 174 | serializable: true, |
174 | get:function () { | 175 | get:function () { |
175 | return this._isDragging; | 176 | return this._isDragging; |
176 | }, | 177 | }, |
177 | set:function (newVal) { | 178 | set:function (newVal) { |
178 | this._isDragging = newVal; | 179 | this._isDragging = newVal; |
179 | } | 180 | } |
180 | 181 | ||
181 | }, | 182 | }, |
182 | 183 | ||
183 | _easing: { | 184 | _easing: { |
184 | value: "none" | 185 | value: "none" |
185 | }, | 186 | }, |
186 | easing: { | 187 | easing: { |
187 | serializable: true, | 188 | serializable: true, |
188 | get:function () { | 189 | get:function () { |
189 | return this._easing; | 190 | return this._easing; |
190 | }, | 191 | }, |
191 | set:function (newVal) { | 192 | set:function (newVal) { |
192 | this._easing = newVal; | 193 | this._easing = newVal; |
193 | } | 194 | } |
194 | 195 | ||
195 | }, | 196 | }, |
196 | 197 | ||
197 | draw:{ | 198 | draw:{ |
198 | value:function () { | 199 | value:function () { |
199 | this.tweenspan.element.style.width = this.spanWidth + "px"; | 200 | this.tweenspan.element.style.width = this.spanWidth + "px"; |
200 | this.keyframe.element.style.left = (this.spanWidth -5) + "px"; | 201 | this.keyframe.element.style.left = (this.spanWidth -5) + "px"; |
201 | this.tweenspan.spanWidth = this.spanWidth; | 202 | this.tweenspan.spanWidth = this.spanWidth; |
202 | this.element.style.left = this.spanPosition + "px"; | 203 | this.element.style.left = this.spanPosition + "px"; |
@@ -225,7 +226,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
225 | handleElementChange:{ | 226 | handleElementChange:{ |
226 | value:function (event) { | 227 | value:function (event) { |
227 | // temp - testing var | 228 | // temp - testing var |
228 | var useAbsolute = true; | 229 | var useAbsolute = true; |
229 | 230 | ||
230 | if(event.detail.type === "cssChange"){ | 231 | if(event.detail.type === "cssChange"){ |
231 | event.detail.source="cssPanelChange" | 232 | event.detail.source="cssPanelChange" |
@@ -250,32 +251,32 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
250 | setTweenProperties:{ | 251 | setTweenProperties:{ |
251 | value:function (eventDetail) { | 252 | value:function (eventDetail) { |
252 | 253 | ||
253 | if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") { | 254 | if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") { |
254 | if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ | 255 | if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ |
255 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; | 256 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; |
256 | } | 257 | } |
257 | if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){ | 258 | if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){ |
258 | this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft + "px"; | 259 | this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft + "px"; |
259 | } | 260 | } |
260 | if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){ |