Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

2 files changed, 45 insertions, 31 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 85fce1ec..3a8d1ff3 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);
@@ -709,15 +718,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                     this.updateKeyframeRule();
                 } else {
                     this.handleNewTween(ev);
-
-                    // Split a tween!
-                    //this.splitTweenAt(this.application.ninja.timeline.playheadmarker.offsetLeft);
                     this.updateKeyframeRule();
                 }
             } else if(ev.actionType == "remove"){
                 this.removeTween();
+                this.updateKeyframeRule();
             }
-
         }
     },
 
@@ -730,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);
@@ -750,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);
@@ -800,8 +808,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this.createMatchingPositionSizeTween(newTween);
             }
 
-
-
             this.application.ninja.currentDocument.model.needsSave = true;
         }
     },
@@ -974,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");
@@ -995,6 +1002,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                                 newTween.tweenData.easing = "none";
                             }
                             this.tweens.push(newTween);
+                            this.createMatchingPositionSizeTween(newTween);
                         }
                         this.nextKeyframe += 1;
                     }
@@ -1022,8 +1030,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function(ruleSet){
             for(var i in ruleSet){
                 var styleProp = ruleSet[i][0].style[0];
-                //console.log(styleProp);
-                //console.log(ruleSet[i]);
                 this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]);
             }
         }
@@ -1056,6 +1062,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++) {