From 45a5deac8ee1e38a6835275230f947b6aa8fb62a Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 26 Jun 2012 15:13:05 -0700
Subject: Timeline: Bug fix: Adding or splitting tweens on multiple layers at
 once will no longer change the selection.

---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'js/panels/Timeline')

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, {
             this.application.ninja.timeline.updateTimeText(currentMillisec);
 
             if (ev.shiftKey) {
+	            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
+	            this.application.ninja.timeline.selectLayer(selectedIndex, true);
                 if (this.tweens.length < 1) {
                     this.insertTween(0);
                     this.addAnimationRuleToElement(ev);
@@ -781,9 +783,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     insertTween:{
         value:function (clickPos) {
-            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-            this.application.ninja.timeline.selectLayer(selectedIndex, true);
-
             var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
             var currentMillisec = currentMillisecPerPixel * clickPos;
             this.trackDuration = currentMillisec;
-- 
cgit v1.2.3