aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-24 11:07:09 -0700
committerValerio Virgillito2012-07-24 11:07:09 -0700
commit98ff98171c1f4a551760a01109ce8f0a80f0c922 (patch)
treece8eb2b461cd545c3487a384940628f3453bb5b8 /js/panels/Timeline
parent55a69aeb3c66b533d5a2d27d7548471c2c8b5dfc (diff)
parent4f0b38baec63b4d1a666d1d9b4e5720553de2983 (diff)
downloadninja-98ff98171c1f4a551760a01109ce8f0a80f0c922.tar.gz
Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja
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