diff options
author | Jonathan Duran | 2012-05-25 14:08:44 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-25 14:08:44 -0700 |
commit | 6808427d3c0defa9f00884711b316f4e76ac54fc (patch) | |
tree | 05dd456a0a42bbf0da76334c3dca9a8abeabbd93 /js/panels | |
parent | c80818b64ec17e3572fe175f1b77a529cb8296ca (diff) | |
download | ninja-6808427d3c0defa9f00884711b316f4e76ac54fc.tar.gz |
animation name string fix
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 5839e0ac..f90e10c2 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -747,12 +747,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
747 | // check for multiple animation names | 747 | // check for multiple animation names |
748 | var animationNameList = this.animationName.split(","); | 748 | var animationNameList = this.animationName.split(","); |
749 | if(animationNameList.length > 1){ | 749 | if(animationNameList.length > 1){ |
750 | this.animationNamesString = this.animationName; | ||
750 | this.animationName = animationNameList[0]; | 751 | this.animationName = animationNameList[0]; |
751 | this.getAllAnimationRules(animationNameList); | 752 | this.getAllAnimationRules(animationNameList); |
753 | } else { | ||
754 | this.animationNamesString = this.animationName; | ||
752 | } | 755 | } |
753 | 756 | ||
754 | this.animationNamesString = this.animationName; | ||
755 | |||
756 | // build tweens for this tracks's keyframe rule | 757 | // build tweens for this tracks's keyframe rule |
757 | if(this.animationName){ | 758 | if(this.animationName){ |
758 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); | 759 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); |