aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorAnanya Sen2012-07-09 16:52:49 -0700
committerAnanya Sen2012-07-09 16:52:49 -0700
commit2eb84584f44b8c774479d1af2ee1d810597474cf (patch)
tree64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Timeline/Tween.reel/Tween.js
parentbf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff)
parentcee0deca695359ab468bd06d0e05ed3b2010b338 (diff)
downloadninja-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/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js95
1 files changed, 48 insertions, 47 deletions
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>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE 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"]){ 261 if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){
261 this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth + "px"; 262 this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth + "px";
262 } 263 }
263 if (this.parentComponent.parentComponent.animatedElement.offsetHeight != this.tweenedProperties["height"]){ 264 if (this.parentComponent.parentComponent.animatedElement.offsetHeight != this.tweenedProperties["height"]){
264 this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight + "px"; 265 this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight + "px";
265 } 266 }
266 // tell track to update css rule 267 // tell track to update css rule
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;
278 } 279 }
279 } 280 }
280 }, 281 },
281 282