aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-24 11:41:42 -0700
committerJose Antonio Marquez2012-07-24 11:41:42 -0700
commit2b4439fed88fbb785ee14a3372ae9480d186bae4 (patch)
treef3f4a9ebde465cd3064027007dabc9857be80ed6 /js/panels/Timeline
parent2f32323d6d5a65feaaa53461a80fcef297a5b65a (diff)
parent98ff98171c1f4a551760a01109ce8f0a80f0c922 (diff)
downloadninja-2b4439fed88fbb785ee14a3372ae9480d186bae4.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index c9b59253..9ad88a69 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -312,6 +312,15 @@ var Tween = exports.Tween = Montage.create(Component, {
312 this.parentComponent.parentComponent.updateKeyframeRule(); 312 this.parentComponent.parentComponent.updateKeyframeRule();
313 this.isTweenAnimated = true; 313 this.isTweenAnimated = true;
314 } 314 }
315
316 if(eventDetail.source === "pi" && eventDetail.type === "setMatrix"){
317 var piArrMat = eventDetail.data.value,
318 piStrTweenProperty = "perspective(1400) matrix3d(" + piArrMat.join() + ")";
319
320 this.tweenedProperties["-webkit-transform"] = piStrTweenProperty;
321 this.parentComponent.parentComponent.updateKeyframeRule();
322 this.isTweenAnimated = true;
323 }
315 } 324 }
316 }, 325 },
317 326