diff options
author | Kris Kowal | 2012-07-09 16:38:08 -0700 |
---|---|---|
committer | Kris Kowal | 2012-07-09 16:38:08 -0700 |
commit | 7bee50379c1df86bb571e0e8d6c08e24d25231f5 (patch) | |
tree | 5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/panels/Timeline/Tween.reel/Tween.js | |
parent | 26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff) | |
download | ninja-7bee50379c1df86bb571e0e8d6c08e24d25231f5.tar.gz |
BSD License
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index ff8d0bad..a2ca7d5b 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,7 +166,7 @@ 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 | }, |
@@ -177,9 +178,9 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
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 | }, |
@@ -191,7 +192,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
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:{ |
@@ -267,11 +268,11 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
267 | this.parentComponent.parentComponent.updateKeyframeRule(); | 268 | this.parentComponent.parentComponent.updateKeyframeRule(); |
268 | this.isTweenAnimated = true; | 269 | this.isTweenAnimated = true; |
269 | } | 270 | } |
270 | 271 | ||
271 | if (eventDetail.source === "translateTool") { | 272 | if (eventDetail.source === "translateTool") { |
272 | var arrMat = eventDetail.data.value[0].properties.mat, | 273 | var arrMat = eventDetail.data.value[0].properties.mat, |
273 | strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")"; | 274 | strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")"; |
274 | 275 | ||
275 | this.tweenedProperties["-webkit-transform"] = strTweenProperty; | 276 | this.tweenedProperties["-webkit-transform"] = strTweenProperty; |
276 | this.parentComponent.parentComponent.updateKeyframeRule(); | 277 | this.parentComponent.parentComponent.updateKeyframeRule(); |
277 | this.isTweenAnimated = true; | 278 | this.isTweenAnimated = true; |