Timeline Reset to clean Master branch. Code scrub.

Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 136 insertions, 56 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 62688825..1c33a040 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -10,10 +10,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _trackID:{
-        value:null,
-        writable:true,
         serializable:true,
-        enumerable:true
+        value:null
     },
 
     trackID:{
@@ -85,21 +83,50 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             }
         }
     },
-
-    _tweens:{
+    
+    _arrStyleTracks : {
         serializable:true,
         enumerable:true,
+        value: []
+    },
+    arrStyleTracks: {
+        serializable:true,
+        enumerable:true,
+        get: function() {
+                return this._arrStyleTracks;
+        },
+        set: function(newVal) {
+                this._arrStyleTracks = newVal;
+                this.needsDraw = true;
+        }
+    },
+    _styleTracksRepetition: {
+        serializable: true,
+        value: null
+    },
+    styleTracksRepetition : {
+        serializable: true,
+        get: function() {
+                return this._styleTracksRepetition;
+        },
+        set: function(newVal) {
+                this._styleTracksRepetition = newVal;
+                this.needsDraw = true;
+        }
+    },
+
+    _tweens:{
+        enumerable: false,
         value:[]
     },
 
     tweens:{
         serializable:true,
-        enumerable:true,
         get:function () {
-            return this._spans;
+            return this._tweens;
         },
         set:function (newVal) {
-            this._spans = newVal;
+            this._tweens = newVal;
         }
     },
 
@@ -118,14 +145,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    _trackDuration:{
+        serializable: true,
+        value:0
+    },
+
     trackDuration:{
+        serializable:true,
+        get:function () {
+            return this._trackDuration;
+        },
+        set:function (val) {
+            this._trackDuration = val;
+        }
+    },
+
+    _trackPosition:{
+        serializable:true,
         value:0
     },
 
-    currentKeyframeRule:{
+    trackPosition:{
+        serializable:true,
+        get:function () {
+            return this._trackPosition;
+        },
+        set:function (val) {
+            this._trackPosition = val;
+        }
+    },
+
+    _currentKeyframeRule:{
+        serializable: true,
         value:null
     },
 
+    currentKeyframeRule:{
+        serializable: true,
+        get:function(){
+            return this._currentKeyframeRule;
+        },
+        set:function(val){
+            this._currentKeyframeRule = val;
+        }
+    },
+
     nextKeyframe:{
         value:1
     },
@@ -134,14 +198,23 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:0
     },
 
-    isAnimated:{
-        value:false
+    _isTrackAnimated:{
+        serializable: true,
+        value:null
+    },
+
+    isTrackAnimated:{
+        serializable: true,
+        get:function(){
+            return this._isTrackAnimated;
+        },
+        set:function(val){
+            this._isTrackAnimated = val;
+        }
     },
 
     _animatedElement:{
         serializable:true,
-        enumerable:true,
-        writable:true,
         value:null
     },
 
@@ -155,12 +228,19 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
-    animationName:{
+    _animationName:{
+        serializable:true,
         value:null
     },
 
-    keyFramePropertyData:{
-        value:[]
+    animationName:{
+        serializable:true,
+        get:function () {
+            return this._animationName;
+        },
+        set:function (val) {
+            this._animationName = val;
+        }
     },
 
     ninjaStylesContoller:{
@@ -184,8 +264,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function () {
             this.init();
             this.ninjaStylesContoller = this.application.ninja.stylesController;
-            this.track_lane.addEventListener("click", this, false);
-            this.keyFramePropertyData = new Array();
+            this.element.addEventListener("click", this, false);
         }
     },
 
@@ -210,8 +289,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function (ev) {
             // 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);
+            //this.application.ninja.timeline.selectLayer(selectIndex);
+
             if (ev.shiftKey) {