diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 85fce1ec..68ea928a 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -709,15 +709,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
709 | this.updateKeyframeRule(); | 709 | this.updateKeyframeRule(); |
710 | } else { | 710 | } else { |
711 | this.handleNewTween(ev); | 711 | this.handleNewTween(ev); |
712 | |||
713 | // Split a tween! | ||
714 | //this.splitTweenAt(this.application.ninja.timeline.playheadmarker.offsetLeft); | ||
715 | this.updateKeyframeRule(); | 712 | this.updateKeyframeRule(); |
716 | } | 713 | } |
717 | } else if(ev.actionType == "remove"){ | 714 | } else if(ev.actionType == "remove"){ |
718 | this.removeTween(); | 715 | this.removeTween(); |
716 | this.updateKeyframeRule(); | ||
719 | } | 717 | } |
720 | |||
721 | } | 718 | } |
722 | }, | 719 | }, |
723 | 720 | ||
@@ -800,8 +797,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
800 | this.createMatchingPositionSizeTween(newTween); | 797 | this.createMatchingPositionSizeTween(newTween); |
801 | } | 798 | } |
802 | 799 | ||
803 | |||
804 | |||
805 | this.application.ninja.currentDocument.model.needsSave = true; | 800 | this.application.ninja.currentDocument.model.needsSave = true; |
806 | } | 801 | } |
807 | }, | 802 | }, |
@@ -995,6 +990,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
995 | newTween.tweenData.easing = "none"; | 990 | newTween.tweenData.easing = "none"; |
996 | } | 991 | } |
997 | this.tweens.push(newTween); | 992 | this.tweens.push(newTween); |
993 | this.createMatchingPositionSizeTween(newTween); | ||
998 | } | 994 | } |
999 | this.nextKeyframe += 1; | 995 | this.nextKeyframe += 1; |
1000 | } | 996 | } |
@@ -1022,8 +1018,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
1022 | value:function(ruleSet){ | 1018 | value:function(ruleSet){ |
1023 | for(var i in ruleSet){ | 1019 | for(var i in ruleSet){ |
1024 | var styleProp = ruleSet[i][0].style[0]; | 1020 | var styleProp = ruleSet[i][0].style[0]; |
1025 | //console.log(styleProp); | ||
1026 | //console.log(ruleSet[i]); | ||
1027 | this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]); | 1021 | this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]); |
1028 | } | 1022 | } |
1029 | } | 1023 | } |