diff options
author | Jonathan Duran | 2012-06-19 14:39:30 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-19 14:39:30 -0700 |
commit | 8e2dda460526735b4db2949656aa2e8ac041ad3c (patch) | |
tree | d633d1760ed42b91adf22876aa6accc1982e4c73 /js/panels/Timeline/Tween.reel | |
parent | a065caf8793cafe5508bffe572ba95e0017840b8 (diff) | |
download | ninja-8e2dda460526735b4db2949656aa2e8ac041ad3c.tar.gz |
prop tween splitting
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 3 |
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(); |