diff options
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 8693e828..a38ecb30 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -603,9 +603,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
603 | this.addAnimationRuleToElement(ev); | 603 | this.addAnimationRuleToElement(ev); |
604 | this.updateKeyframeRule(); | 604 | this.updateKeyframeRule(); |
605 | } else { | 605 | } else { |
606 | //console.log(ev); | ||
606 | if (ev.target.className === "tracklane") { | 607 | if (ev.target.className === "tracklane") { |
607 | this.handleNewTween(ev); | 608 | this.handleNewTween(ev); |
608 | this.updateKeyframeRule(); | 609 | this.updateKeyframeRule(); |
610 | } else if (ev.target.className === "tween_span" && ev.target.parentElement.parentElement.className === "tracklane"){ | ||
611 | this.handleNewTween(ev); | ||
612 | this.updateKeyframeRule(); | ||
609 | } | 613 | } |
610 | } | 614 | } |
611 | } else { | 615 | } else { |
@@ -726,6 +730,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
726 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; | 730 | this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; |
727 | if(this.animatedElement!==undefined){ | 731 | if(this.animatedElement!==undefined){ |
728 | 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 | this.animationNamesString = this.animationName; | ||
729 | if(this.animationName){ | 734 | if(this.animationName){ |
730 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); | 735 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); |
731 | this.nextKeyframe = 0; | 736 | this.nextKeyframe = 0; |