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

1 files changed, 13 insertions, 7 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index d4eabbf5..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);
@@ -743,6 +745,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     handleNewTween:{
         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);
@@ -750,10 +753,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             } else {
                 // We will be splitting a tween.  Get the x-coordinate of the mouse click within the target element.
                 // You'd think you could use the event.x info for that, right? NO. We must use page values, calculating offsets and scrolling.
-                                var targetElementOffset = this.findXOffset(ev.currentTarget),
-                                        position = event.pageX - targetElementOffset;
-
-                this.splitTweenAt(position-18);
+                    if (typeof(ev.currentTarget) === "undefined") {
+                        this.splitTweenAt(ev.offsetX);
+                    } else {
+                                        var targetElementOffset = this.findXOffset(ev.currentTarget),
+                                                position = event.pageX - targetElementOffset;
+                        this.splitTweenAt(position-18);
+                    }
             }
         }
     },
@@ -762,6 +768,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function (obj) {
             // Here's an easy function that adds up offsets and scrolls and returns the page x value of an element
             var curleft = 0;
+            if (typeof(obj) === "undefined") {
+                //debugger;
+            }
             if (obj.offsetParent) {
                 do {
                     curleft += (obj.offsetLeft - obj.scrollLeft);
@@ -774,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;