Merge branch 'refs/heads/Ninja-Internal' into FileIO

1 files changed, 475 insertions, 74 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 87a5e156..bf380e00 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -42,6 +42,14 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    positionPropertyTrack:{
+        value:null
+    },
+    
+    _isFirstDraw: {
+        value: true
+    },
+
     _isVisible:{
         value: true
     },
@@ -147,6 +155,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value: null
     },
     styleTracksRepetition : {
+        serializable:true,
         get: function() {
                 return this._styleTracksRepetition;
         },
@@ -166,9 +175,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._arrPositionTracks = newVal;
-                if (typeof(this.trackData) === "undefined") {
-                        //this.createTrackData();
-                }
                 this.trackData.arrPositionTracks = newVal;
             
         }
@@ -184,8 +190,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this._positionTracksRepetition = newVal;
         }
     },
-    
-    
+
+
     /* Transform Property Tracks */
     _arrTransformTracks : {
         value: []
@@ -200,17 +206,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.arrTransformTracks = newVal;
         }
     },
-    _transformTracksRepetition: {
-        value: null
-    },
-    transformTracksRepetition : {
-        get: function() {
-                return this._transformTracksRepetition;
-        },
-        set: function(newVal) {
-                this._transformTracksRepetition = newVal;
-        }
-    },
 
     _tweens:{
         value:[]
@@ -233,10 +228,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     tweenRepetition:{
         get:function () {
-            return this._spanRepetition;
+            return this._tweenRepetition;
         },
         set:function (newVal) {
-            this._spanRepetition = newVal;
+            this._tweenRepetition = newVal;
         }
     },
 
@@ -341,6 +336,23 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    _ruleList:{
+        value:[]
+    },
+
+    ruleList:{
+        get:function () {
+            return this._ruleList;
+        },
+        set:function (val) {
+            this._ruleList = val;
+        }
+    },
+
+    animationNamesString:{
+        value:""
+    },
+
     ninjaStylesContoller:{
         value:null
     },
@@ -394,6 +406,42 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+        // Drag and Drop properties
+    _dragAndDropHelper : {
+        value: false
+    },
+    _dragAndDropHelperCoords: {
+        value: false
+    },
+    dragAndDropHelperCoords: {
+        get: function() {
+                return this._dragAndDropHelperCoords;
+        },
+        set: function(newVal) {
+                this._dragAndDropHelperCoords = newVal;
+        }
+    },
+    _draggingIndex: {
+        value: false
+    },
+    draggingIndex: {
+        get: function() {
+                return this._draggingIndex;
+        },
+        set: function(newVal) {
+                this._draggingIndex = newVal;
+        }
+    },
+    _dragAndDropHelperOffset : {
+        value: false
+    },
+    _appendHelper: {
+        value: false
+    },
+    _deleteHelper: {
+        value: false
+    },
+
     _trackData:{
                 value: false
     },
@@ -423,7 +471,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.bypassAnimation = this.trackData.bypassAnimation;
             this.trackID = this.trackData.layerID;
             this.tweens = this.trackData.tweens;
-            this.animatedElement = this.trackData.animatedElement; // unneeded with one element per layer restriction
+            this.arrPositionTracks = this.trackData.arrPositionTracks;
+            this.animatedElement = this.trackData.animatedElement;
             this.arrStyleTracks = this.trackData.arrStyleTracks;
             this.isTrackAnimated = this.trackData.isTrackAnimated;
             this.trackDuration = this.trackData.trackDuration;
@@ -435,9 +484,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.isStyleCollapsed = this.trackData.isStyleCollapsed;
             this.trackPosition = this.trackData.trackPosition;
             this.isVisible = this.trackData.isVisible;
+            this.trackEditorProperty = "master";
             this.needsDraw = true;
         }
     },
+
     createTrackData: {
         value: function() {
                 tempData = {};
@@ -446,6 +497,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             tempData.tweens = this.tweens;
             tempData.animatedElement = this.animatedElement; 
             tempData.arrStyleTracks = this.arrStyleTracks;
+            tempData.arrPositionTracks = this.arrPositionTracks;
             tempData.isTrackAnimated = this.isTrackAnimated;
             tempData.trackDuration = this.trackDuration;
             tempData.animationName = this.animationName;
@@ -488,6 +540,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.ninjaStylesContoller = this.application.ninja.stylesController;
             this.element.addEventListener("click", this, false);
             this.eventManager.addEventListener("tlZoomSlider", this, false);
+            
+            // Drag and Drop event handlers 
+                        //this.element.addEventListener("dragover", this.handleKeyframeDragover.bind(this), false);
+                        this.element.addEventListener("dragsta