diff options
author | Jonathan Duran | 2012-02-28 10:07:04 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-28 10:07:04 -0800 |
commit | 09d487fb5d28a181f69e3c6afa87d6e2f624317b (patch) | |
tree | cf46316d0cd72b680ba7ac2e24cfc287e684a4da /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | ffe308bc1c876b83a0b24fc1234a16f21a601aa2 (diff) | |
download | ninja-09d487fb5d28a181f69e3c6afa87d6e2f624317b.tar.gz |
Fix to animation names to support multiclassed elements
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index bbf505fc..43cd7477 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -532,7 +532,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
532 | this.tweens[0].tweenedProperties["top"] = this.animatedElement.offsetTop; | 532 | this.tweens[0].tweenedProperties["top"] = this.animatedElement.offsetTop; |
533 | this.tweens[0].tweenedProperties["left"] = this.animatedElement.offsetLeft; | 533 | this.tweens[0].tweenedProperties["left"] = this.animatedElement.offsetLeft; |
534 | var animationDuration = Math.round(this.trackDuration / 1000) + "s"; | 534 | var animationDuration = Math.round(this.trackDuration / 1000) + "s"; |
535 | this.animationName = "animation_" + this.animatedElement.className; | 535 | this.animationName = "animation_" + this.animatedElement.classList[0]; |
536 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName); | 536 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName); |
537 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration); | 537 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration); |
538 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", "infinite"); | 538 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", "infinite"); |