diff options
author | Jonathan Duran | 2012-03-02 11:26:25 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-03-02 11:26:25 -0800 |
commit | abc04f3d50311ed1c21067344bc7e448686f8c5c (patch) | |
tree | aa9885e1d798f75166510ca47533c5e1fcad21f6 /js/panels | |
parent | 5425be91e7125c22955b4459a62412ff574e49a8 (diff) | |
download | ninja-abc04f3d50311ed1c21067344bc7e448686f8c5c.tar.gz |
Timeline Fix timing function
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 296af8f8..9894e6f9 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -532,6 +532,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
532 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration); | 532 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration); |
533 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1); | 533 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1); |
534 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both"); | 534 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both"); |
535 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear"); | ||
535 | var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {top: " + this.animatedElement.offsetTop + "px; left: " + this.animatedElement.offsetLeft + "px;} 100% {top: " + this.animatedElement.offsetTop + "px; left: " + this.animatedElement.offsetLeft + "px;} }"; | 536 | var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {top: " + this.animatedElement.offsetTop + "px; left: " + this.animatedElement.offsetLeft + "px;} 100% {top: " + this.animatedElement.offsetTop + "px; left: " + this.animatedElement.offsetLeft + "px;} }"; |
536 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule); | 537 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule); |
537 | this.insertTween(tweenEvent.offsetX); | 538 | this.insertTween(tweenEvent.offsetX); |