Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-multiselect

3 files changed, 35 insertions, 7 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 31e0b3b6..f2004b94 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -28,6 +28,21 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
         }
     },
 
+    didDraw:{
+        value:function () {
+            if ((!this.application.ninja.documentController.creatingNewFile) || (!this.application.ninja.currentDocument.setLevel)) {
+                if (this.application.ninja.currentDocument.documentRoot.children[0]) {
+                    var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
+                    if (selectedIndex !== false) {
+                        if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
+                            //this.retrieveStoredStyleTweens();
+                        }
+                    }
+                }
+            }
+        }
+    },
+
     trackEditorProperty:{
         value:""
     },
@@ -186,7 +201,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                             //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
                         }
                     } else if (this.trackType === "position") {
-                        console.log("Property track editorProperty set to: " + this.trackEditorProperty);
+                        //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
                     }
 
                     this.insertPropTween(0);
@@ -202,7 +217,12 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     handleNewPropTween:{
         value:function(ev){
-            this.insertPropTween(ev.offsetX);
+            if (ev.offsetX > this.propTweens[this.propTweens.length - 1].tweenData.keyFramePosition) {
+                this.insertPropTween(ev.offsetX);
+            } else {
+                console.log("spitting sub keyframes not yet supported");
+            }
+
         }
     },
 
@@ -248,7 +268,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     retrieveStoredStyleTweens:{
         value:function(){
-
+            console.log("retrieve style tweens");
         }
     },
 
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 8693e828..a38ecb30 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -603,9 +603,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                         this.addAnimationRuleToElement(ev);
                         this.updateKeyframeRule();
                     } else {
+                        //console.log(ev);
                         if (ev.target.className === "tracklane") {
                             this.handleNewTween(ev);
                             this.updateKeyframeRule();
+                        } else if (ev.target.className === "tween_span" && ev.target.parentElement.parentElement.className === "tracklane"){
+                            this.handleNewTween(ev);
+                            this.updateKeyframeRule();
                         }
                     }
                 } else {
@@ -726,6 +730,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0];
             if(this.animatedElement!==undefined){
                 this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
+                this.animationNamesString = this.animationName;
                 if(this.animationName){
                     trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
                     this.nextKeyframe = 0;
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 3c0223c1..33fed17a 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -234,8 +234,8 @@ var Tween = exports.Tween = Montage.create(Component, {
             //console.log(eventDetail);
 
             if(eventDetail.type == "setProperties"){
-                // ignore top, left, width, and height
-                console.log(eventDetail.data.value[0]);
+                // need to ignore top, left, width, and height
+                //console.log(eventDetail.data.value[0]);
                 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
 
@@ -245,8 +245,8 @@ var Tween = exports.Tween = Montage.create(Component, {
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
 
             } else if(eventDetail.type == "setProperty"){
-                // ignore top, left, width, and height
-                console.log(eventDetail.data.value[0]);
+                // need to ignore top, left, width, and height
+                //console.log(eventDetail.data.value[0]);
                 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
 
@@ -278,6 +278,9 @@ var Tween = exports.Tween = Montage.create(Component, {
 
             if(this.parentComponent.parentComponent.isSubproperty){
                 // set property specific style on element
+                var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty];
+                this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween");
+                //console.log(currentValue);
             } else {
                 // move animated element to correct position on stage
                 var currentTop = this.tweenedProperties["top"] + "px";