aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJon Reid2012-06-18 16:46:00 -0700
committerJon Reid2012-06-18 16:46:00 -0700
commite600253fa8e6027c4bac7ebb69e0d4ce12a76ff8 (patch)
tree8252f4fcbc20535dbd2ba299d790fd9b55748f19 /js/panels/Timeline
parent3163108217677d7eec1c79cf6aa7525cdd6600ef (diff)
downloadninja-e600253fa8e6027c4bac7ebb69e0d4ce12a76ff8.tar.gz
Timeline: Enable splitting of keyframes with F6 interaction.
Bug fix: Error on console if you press F6 with no layer selected.
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js7
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js7
2 files changed, 10 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 27b3537c..339ca5a4 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1016,7 +1016,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1016 //console.log(this.trackRepetition); 1016 //console.log(this.trackRepetition);
1017 var tempEv = {}; 1017 var tempEv = {};
1018 tempEv.offsetX = this.playheadmarker.offsetLeft; 1018 tempEv.offsetX = this.playheadmarker.offsetLeft;
1019 this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv); 1019 if (typeof(this.trackRepetition.childComponents[this.currentLayersSelected[0]]) !== "undefined") {
1020 this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv);
1021 } else {
1022 // oops, we do not have a layer selected. We should growl at the user. For now, this will fail silently.
1023 }
1024
1020 } 1025 }
1021 }, 1026 },
1022 1027
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index a4d20c39..84bac2cb 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -703,9 +703,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
703 this.addAnimationRuleToElement(ev); 703 this.addAnimationRuleToElement(ev);
704 this.updateKeyframeRule(); 704 this.updateKeyframeRule();
705 } else { 705 } else {
706 706 //this.handleNewTween(ev);
707 707
708 this.handleNewTween(ev); 708 // Split a tween!
709 this.splitTweenAt(this.application.ninja.timeline.playheadmarker.offsetLeft)
709 this.updateKeyframeRule(); 710 this.updateKeyframeRule();
710 } 711 }
711 } 712 }