Merge branch 'refs/heads/timeline-local' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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 9a67c969..f443553c 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -643,7 +643,9 @@ 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);
+                    // this.application.ninja.timeline.selectLayer(selectedIndex, true); // deprecated
+                    this.application.ninja.timeline.selectLayers([selectedIndex]);
+                    this.application.ninja.timeine.updateStageSelection();
                 if (this.tweens.length < 1) {
                     this.insertTween(0);
                     this.addAnimationRuleToElement(ev);
@@ -742,7 +744,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function (ev) {
             if (ev.offsetX > this.tweens[this.tweens.length - 1].tweenData.keyFramePosition) {
                 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-                this.application.ninja.timeline.selectLayer(selectedIndex, false);
+                // this.application.ninja.timeline.selectLayer(selectedIndex, false); // deprecated
+                this.application.ninja.timeline.selectLayers([selectedIndex]);
                 this.insertTween(ev.offsetX);
             } else {
                     if (typeof(ev.currentTarget) === "undefined") {