From 38aed3f1068dcd06089619f3b5278e01c42b0512 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 22 May 2012 11:04:57 -0700 Subject: update ease method to distinguish between main animation and prop animations Signed-off-by: Jonathan Duran --- js/panels/Timeline/Tween.reel/Tween.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline') diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index de6a8d56..2a21c330 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -243,7 +243,12 @@ var Tween = exports.Tween = Montage.create(Component, { value:function(easeType){ // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2) this.tweenedProperties["-webkit-animation-timing-function"] = easeType; - this.parentComponent.parentComponent.updatePropKeyframeRule(); + if(this.parentComponent.parentComponent.isSubproperty){ + this.parentComponent.parentComponent.updatePropKeyframeRule(); + } else { + this.parentComponent.parentComponent.updateKeyframeRule(); + } + } }, -- cgit v1.2.3