aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-19 18:05:10 -0700
committerJon Reid2012-06-19 18:05:10 -0700
commit8069a7626339f5076ba5cb433f1e7376660e11eb (patch)
treef6ee3352218996da8d91c0a6977a28c3f4b83d56 /js/panels/Timeline/Tween.reel
parent0da75e4de7373ed361b5d76be4ee192453146dde (diff)
parent8e2dda460526735b4db2949656aa2e8ac041ad3c (diff)
downloadninja-8069a7626339f5076ba5cb433f1e7376660e11eb.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index dcc139a5..db368caf 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -271,6 +271,9 @@ var Tween = exports.Tween = Montage.create(Component, {
271 // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2) 271 // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2)
272 this.tweenedProperties["-webkit-animation-timing-function"] = easeType; 272 this.tweenedProperties["-webkit-animation-timing-function"] = easeType;
273 if(this.parentComponent.parentComponent.isSubproperty){ 273 if(this.parentComponent.parentComponent.isSubproperty){
274 if(this.parentComponent.parentComponent.trackType == "position"){
275 return;
276 }
274 this.parentComponent.parentComponent.updatePropKeyframeRule(); 277 this.parentComponent.parentComponent.updatePropKeyframeRule();
275 } else { 278 } else {
276 this.parentComponent.parentComponent.updateKeyframeRule(); 279 this.parentComponent.parentComponent.updateKeyframeRule();