1 files changed, 113 insertions, 0 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 175b77f9..8f7745e5 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -15,6 +15,119 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     prepareForDraw:{
         value:function(){
+            this.element.addEventListener("click", this, false);
+        }
+    },
+
+    draw:{
+        value:function(){
+
+        }
+    },
+
+    _propTweenRepetition:{
+        value:null
+    },
+
+    propTweenRepetition:{
+        serializable:true,
+        get:function () {
+            return this._propTweenRepetition;
+        },
+        set:function (newVal) {
+            this._propTweenRepetition = newVal;
+        }
+    },
+
+    _propTweens:{
+        value:[]
+    },
+
+    propTweens:{
+        serializable:true,
+        get:function () {
+            return this._propTweens;
+        },
+        set:function (newVal) {
+            this._propTweens = newVal;
+        }
+    },
+
+    nextKeyframe:{
+        value:1
+    },
+
+    handleClick:{
+        value:function(ev){
+            var parentTrackID = this.parentComponent.parentComponent.parentComponent.trackID;
+            var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(parentTrackID);
+            //console.log(this.application.ninja.timeline.arrLayers[selectedIndex].layerData);
+            this.application.ninja.timeline.selectLayer(selectedIndex, true);
+
+            if (ev.shiftKey) {
+                if (this.propTweens.length < 1) {
+                    this.insertPropTween(0);
+                    this.addPropAnimationRuleToElement(ev);
+                    this.updatePropKeyframeRule();
+                } else {
+                    this.handleNewPropTween(ev);
+                    this.updatePropKeyframeRule();
+                }
+            }
+        }
+    },
+
+    handleNewPropTween:{
+        value:function(ev){
+            this.insertPropTween(ev.offsetX);
+        }
+    },
+
+    insertPropTween:{
+        value:function(clickPos){
+            var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+            var currentMillisec = currentMillisecPerPixel * clickPos;
+
+            var newTween = {};
+            newTween.tweenData = {};
+
+            if (clickPos == 0) {
+                newTween.tweenData.spanWidth = 0;
+                newTween.tweenData.keyFramePosition = 0;
+                newTween.tweenData.keyFrameMillisec = 0;
+                newTween.tweenData.tweenID = 0;
+                newTween.tweenData.spanPosition = 0;
+                newTween.tweenData.tweenedProperties = [];
+
+                this.propTweens.push(newTween);
+
+            } else {
+                newTween.tweenData.spanWidth = clickPos - this.propTweens[this.propTweens.length - 1].tweenData.keyFramePosition;
+                newTween.tweenData.keyFramePosition = clickPos;
+                newTween.tweenData.keyFrameMillisec = currentMillisec;
+                newTween.tweenData.tweenID = this.nextKeyframe;
+                newTween.tweenData.spanPosition = clickPos - newTween.tweenData.spanWidth;
+                newTween.tweenData.tweenedProperties = [];
+
+                this.propTweens.push(newTween);
+
+                this.nextKeyframe += 1;
+            }
+
+            this.application.ninja.documentController.activeDocument.needsSave = true;
+        }
+    },
+
+    updatePropKeyframeRule:{
+        value:function(){
+
+        }
+    },
+
+    addPropAnimationRuleToElement:{
+        value:function(tweenEvent){
+            console.log("SECOND PROP TWEEN ADDING at " + tweenEvent.offsetX);
+            this.insertPropTween(tweenEvent.offsetX);
 
         }
     }