diff options
author | Jonathan Duran | 2012-05-16 14:02:58 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-16 14:02:58 -0700 |
commit | 6f86dcc9df20727155f7507f4998baee38b8d01a (patch) | |
tree | d88c1878ef1d503a67ac5968bf7ddb5d8eaa6f84 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | a5e3eb0cec55858cf911bffc429ce1de817a60ef (diff) | |
download | ninja-6f86dcc9df20727155f7507f4998baee38b8d01a.tar.gz |
Fix restore tween for main layer track with multiple animation names
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index a38ecb30..8beb7b5d 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -730,7 +730,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
730 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; | 730 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; |
731 | if(this.animatedElement!==undefined){ | 731 | if(this.animatedElement!==undefined){ |
732 | this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name"); | 732 | this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name"); |
733 | var animationNameList = this.animationName.split(","); | ||
734 | if(animationNameList.length > 1){ | ||
735 | this.animationName = animationNameList[0]; | ||
736 | } | ||
737 | |||
733 | this.animationNamesString = this.animationName; | 738 | this.animationNamesString = this.animationName; |
739 | |||
734 | if(this.animationName){ | 740 | if(this.animationName){ |
735 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); | 741 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); |
736 | this.nextKeyframe = 0; | 742 | this.nextKeyframe = 0; |