diff options
author | Jon Reid | 2012-06-26 15:13:05 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-26 15:13:05 -0700 |
commit | 45a5deac8ee1e38a6835275230f947b6aa8fb62a (patch) | |
tree | 46dea35f70cbbd06803239aed179b66fa5340847 /js/panels | |
parent | 2599f74d72293b809929d8a0b36fb8e721f194cd (diff) | |
download | ninja-45a5deac8ee1e38a6835275230f947b6aa8fb62a.tar.gz |
Timeline: Bug fix: Adding or splitting tweens on multiple layers at once
will no longer change the selection.
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 297423dd..014d3f34 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -706,6 +706,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
706 | this.application.ninja.timeline.updateTimeText(currentMillisec); | 706 | this.application.ninja.timeline.updateTimeText(currentMillisec); |
707 | 707 | ||
708 | if (ev.shiftKey) { | 708 | if (ev.shiftKey) { |
709 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | ||
710 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | ||
709 | if (this.tweens.length < 1) { | 711 | if (this.tweens.length < 1) { |
710 | this.insertTween(0); | 712 | this.insertTween(0); |
711 | this.addAnimationRuleToElement(ev); | 713 | this.addAnimationRuleToElement(ev); |
@@ -781,9 +783,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
781 | 783 | ||
782 | insertTween:{ | 784 | insertTween:{ |
783 | value:function (clickPos) { | 785 | value:function (clickPos) { |
784 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | ||
785 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | ||
786 | |||
787 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); | 786 | var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); |
788 | var currentMillisec = currentMillisecPerPixel * clickPos; | 787 | var currentMillisec = currentMillisecPerPixel * clickPos; |
789 | this.trackDuration = currentMillisec; | 788 | this.trackDuration = currentMillisec; |