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

1 files changed, 23 insertions, 3 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");
         }
     },