aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-22 11:04:57 -0700
committerJonathan Duran2012-05-22 11:04:57 -0700
commit38aed3f1068dcd06089619f3b5278e01c42b0512 (patch)
tree79125b9a9246b9562e8d0143e1762535bda19e42 /js
parent0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff)
downloadninja-38aed3f1068dcd06089619f3b5278e01c42b0512.tar.gz
update ease method to distinguish between main animation and prop animations
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js7
1 files changed, 6 insertions, 1 deletions
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, {
243 value:function(easeType){ 243 value:function(easeType){
244 // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2) 244 // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2)
245 this.tweenedProperties["-webkit-animation-timing-function"] = easeType; 245 this.tweenedProperties["-webkit-animation-timing-function"] = easeType;
246 this.parentComponent.parentComponent.updatePropKeyframeRule(); 246 if(this.parentComponent.parentComponent.isSubproperty){
247 this.parentComponent.parentComponent.updatePropKeyframeRule();
248 } else {
249 this.parentComponent.parentComponent.updateKeyframeRule();
250 }
251
247 } 252 }
248 }, 253 },
249 254