diff options
author | Jonathan Duran | 2012-03-02 11:11:48 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-03-02 11:11:48 -0800 |
commit | 5425be91e7125c22955b4459a62412ff574e49a8 (patch) | |
tree | 24a8b2f56a4f9d6b99672d586e372a511a9551b2 /js/panels/Timeline/TimelineTrack.reel | |
parent | b8fad971d8cf82cdc182160aa72d0c8e69800f76 (diff) | |
download | ninja-5425be91e7125c22955b4459a62412ff574e49a8.tar.gz |
Timeline: Fix for animation iteration count
Add default webkit css properties to allow animations with integer iteration counts.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 74a7f962..296af8f8 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -530,7 +530,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
530 | this.animationName = "animation_" + this.animatedElement.classList[0]; | 530 | this.animationName = "animation_" + this.animatedElement.classList[0]; |
531 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName); | 531 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName); |
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", "infinite"); | 533 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1); |
534 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both"); | ||
534 | 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;} }"; | 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;} }"; |
535 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule); | 536 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule); |
536 | this.insertTween(tweenEvent.offsetX); | 537 | this.insertTween(tweenEvent.offsetX); |