2 files changed, 47 insertions, 24 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 79014ae6..658764c8 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -56,7 +56,7 @@
                    "styleTrackRepetition": {
                        "prototype": "montage/ui/repetition.reel",
                            "properties": {
-                               "element": {"#": "content-styles"},
+                               "element": {"#": "content_style_tracks"},
                                "isSelectionEnabled" : false
                            },
                            "bindings": {
@@ -195,22 +195,23 @@
             </div>
             <div class="label-main collapsible-label collapsible-collapsed" data-montage-id="label-main"></div>
             <div class="collapsible-content collapsible-collapsed content-main" data-montage-id="content-main">
-                <div class="label-position collapsible-label collapsible-collapsed" data-montage-id="label-position">
 
-                </div>
-                <div class="content-position collapsible-content collapsible-collapsed"
-                     data-montage-id="content_position_collapser">
+                <div class="label-position collapsible-label collapsible-collapsed" data-montage-id="label-position"></div>
+
+                <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content_position_collapser">
                     <div data-montage-id="content_position_tracks">
                         <div data-montage-id="position_track_base"></div>
                     </div>
                 </div>
 
-                <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles">
-                        
-                </div>
-                <div data-montage-id="content-styles" class="content-styles collapsible-content collapsible-collapsed">
-                        <div data-montage-id="style-track-base"></div>
+                <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles"></div>
+
+                <div class="content-styles collapsible-content collapsible-collapsed" data-montage-id="content-styles">
+                    <div data-montage-id="content_style_tracks">
+                            <div data-montage-id="style-track-base"></div>
+                    </div>
                 </div>
+
             </div>
         </div>
 
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 68ea928a..98989022 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -682,6 +682,15 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             // TEMP - if the SHIFT key is down, add a new keyframe or split an existing span
             // This needs to move to a keyboard shortcut that is TBD
             var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
+
+            var targetElementOffset = this.findXOffset(ev.currentTarget),
+                position = (event.pageX - targetElementOffset) - 18;
+
+            this.application.ninja.timeline.playheadmarker.style.left = position + "px";
+            var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+            var currentMillisec = currentMillisecPerPixel * position;
+            this.application.ninja.timeline.updateTimeText(currentMillisec);
+
             if (ev.shiftKey) {
                 if (this.tweens.length < 1) {
                     this.insertTween(0);
@@ -727,19 +736,7 @@ 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.
-
-                // Here's an easy function that adds up offsets and scrolls and returns the page x value of an element
-                                var findXOffset = function(obj) {
-                                        var curleft = 0;
-                                        if (obj.offsetParent) {
-                                                do {
-                                                                curleft += (obj.offsetLeft-obj.scrollLeft);
-                                        
-                                                        } while (obj = obj.offsetParent);
-                                        }
-                                        return curleft;
-                                }
-                                var targetElementOffset = findXOffset(ev.currentTarget),
+                                var targetElementOffset = this.findXOffset(ev.currentTarget),
                                         position = event.pageX - targetElementOffset;
 
                 this.splitTweenAt(position-18);
@@ -747,6 +744,20 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    findXOffset:{
+        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 (obj.offsetParent) {
+                do {
+                    curleft += (obj.offsetLeft - obj.scrollLeft);
+
+                } while (obj = obj.offsetParent);
+            }
+            return curleft;
+        }
+    },
+
     insertTween:{
         value:function (clickPos) {
             var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
@@ -969,6 +980,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                             newTween.tweenData.tweenID = 0;
                             newTween.tweenData.spanPosition = 0;
                             this.tweens.push(newTween);
+                            this.createMatchingPositionSizeTween(newTween);
                         }
                         else {
                             tempTiming = trackTiming.split("s");
@@ -1027,16 +1039,19 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function (tweenEvent) {
             this.tweens[0].tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px";
             this.tweens[0].tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px";
+            this.tweens[0].tweenData.tweenedProperties["width"] = this.animatedElement.offsetWidth + "px";
+            this.tweens[0].tweenData.tweenedProperties["height"] = this.animatedElement.offsetHeight + "px";
             var animationDuration = Math.round(this.trackDuration / 1000) + "s";
             this.animationName = this.animatedElement.classList[0] + "_PositionSize";
             this.animationNamesString = this.animationName;
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName);
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration);
+            this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "forwards");
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1);
+
             var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {top: " + this.animatedElement.offsetTop + "px; left: " + this.animatedElement.offsetLeft + "px;} 100% {top: " + this.animatedElement.offsetTop + "px; left: " + this.animatedElement.offsetLeft + "px;} }";
 
             this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule);
-
             this.insertTween(tweenEvent.offsetX);
             this.isTrackAnimated = true;
         }
@@ -1050,6 +1065,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             // build the new keyframe string
             var keyframeString = "@-webkit-keyframes " + this.animationName + " {";
 
+            //console.log(this.animationName);
+
             for (var i = 0; i < this.tweens.length; i++) {
                 var keyMill = parseInt(this.tweens[i].tweenData.keyFrameMillisec);
                 // TODO - trackDur should be parseFloat rounded to significant digits
@@ -1085,6 +1102,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     createPositionTracks:{
         value:function(){
             // create track objects for position and transform tracks and push into arrays
+            
+            // ... but only do it if we haven't already.
+            if (this.arrPositionTracks.length > 0) {
+                return;
+            }
 
             // create 'left' track
             var newLeftTrack = {};