diff options
author | Jon Reid | 2012-07-03 15:47:50 -0700 |
---|---|---|
committer | Jon Reid | 2012-07-03 15:47:50 -0700 |
commit | 8c087f7c13a2bd72e1640e99e339a74fc2250901 (patch) | |
tree | 1e69a65489e240bb7eab3a857c4acd7429f54f79 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | 539f430f95812e726ad14012965ece942a010bca (diff) | |
download | ninja-8c087f7c13a2bd72e1640e99e339a74fc2250901.tar.gz |
Timeline: First pass at cleaning up TimelineTrack code. Changes propagated
to PropertyTrack, TimelineTrack, and Tween classes.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 9f2b2eb0..7c497dd9 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -619,7 +619,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
619 | this.application.ninja.timeline.updateTimeText(currentMillisec); | 619 | this.application.ninja.timeline.updateTimeText(currentMillisec); |
620 | if (ev.shiftKey) { | 620 | if (ev.shiftKey) { |
621 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 621 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
622 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | 622 | // this.application.ninja.timeline.selectLayer(selectedIndex, true); // deprecated |
623 | this.application.ninja.timeline.selectLayers([selectedIndex]); | ||
624 | this.application.ninja.timeine.updateStageSelection(); | ||
623 | if (this.tweens.length < 1) { | 625 | if (this.tweens.length < 1) { |
624 | this.insertTween(0); | 626 | this.insertTween(0); |
625 | this.addAnimationRuleToElement(ev); | 627 | this.addAnimationRuleToElement(ev); |
@@ -718,7 +720,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
718 | value:function (ev) { | 720 | value:function (ev) { |
719 | if (ev.offsetX > this.tweens[this.tweens.length - 1].tweenData.keyFramePosition) { | 721 | if (ev.offsetX > this.tweens[this.tweens.length - 1].tweenData.keyFramePosition) { |
720 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 722 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
721 | this.application.ninja.timeline.selectLayer(selectedIndex, false); | 723 | // this.application.ninja.timeline.selectLayer(selectedIndex, false); // deprecated |
724 | this.application.ninja.timeline.selectLayers([selectedIndex]); | ||
722 | this.insertTween(ev.offsetX); | 725 | this.insertTween(ev.offsetX); |
723 | } else { | 726 | } else { |
724 | if (typeof(ev.currentTarget) === "undefined") { | 727 | if (typeof(ev.currentTarget) === "undefined") { |