aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJon Reid2012-05-22 18:23:45 -0700
committerJon Reid2012-05-22 18:23:45 -0700
commitf6c90db55e6118b744d492e38e9e967afc64d14b (patch)
tree73042a4088db09dbf258199b572311989779f97e /js
parentd3f67c2e306cb1888099f4decba00a9d8727cc43 (diff)
parent38aed3f1068dcd06089619f3b5278e01c42b0512 (diff)
downloadninja-f6c90db55e6118b744d492e38e9e967afc64d14b.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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