1 files changed, 288 insertions, 62 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index e46a5eb0..8693e828 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -16,7 +16,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _trackID:{
-        serializable:true,
         value:null
     },
 
@@ -32,6 +31,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 }
         }
     },
+    
+    _isFirstDraw: {
+        value: true
+    },
+    
     _isVisible:{
         value: true
     },
@@ -105,7 +109,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _bypassAnimation : {
-        serializable: true,
         value: false
     },
     bypassAnimation : {
@@ -122,13 +125,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
     
     _arrStyleTracks : {
-        serializable:true,
-        enumerable:true,
         value: []
     },
     arrStyleTracks: {
         serializable:true,
-        enumerable:true,
         get: function() {
                 return this._arrStyleTracks;
         },
@@ -138,11 +138,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _styleTracksRepetition: {
-        serializable: true,
         value: null
     },
     styleTracksRepetition : {
-        serializable: true,
+        serializable:true,
         get: function() {
                 return this._styleTracksRepetition;
         },
@@ -153,13 +152,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     
     /* Position Property Tracks */
     _arrPositionTracks : {
-        serializable:true,
-        enumerable:true,
         value: []
     },
     arrPositionTracks: {
         serializable:true,
-        enumerable:true,
         get: function() {
                 return this._arrPositionTracks;
         },
@@ -169,11 +165,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _positionTracksRepetition: {
-        serializable: true,
         value: null
     },
     positionTracksRepetition : {
-        serializable: true,
         get: function() {
                 return this._positionTracksRepetition;
         },
@@ -185,13 +179,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     
     /* Transform Property Tracks */
     _arrTransformTracks : {
-        serializable:true,
-        enumerable:true,
         value: []
     },
     arrTransformTracks: {
         serializable:true,
-        enumerable:true,
         get: function() {
                 return this._arrTransformTracks;
         },
@@ -200,27 +191,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.arrTransformTracks = newVal;
         }
     },
-    _transformTracksRepetition: {
-        serializable: true,
-        value: null
-    },
-    transformTracksRepetition : {
-        serializable: true,
-        get: function() {
-                return this._transformTracksRepetition;
-        },
-        set: function(newVal) {
-                this._transformTracksRepetition = newVal;
-        }
-    },
 
     _tweens:{
-        enumerable: false,
         value:[]
     },
 
     tweens:{
-        serializable:true,
+        serializable: true,
         get:function () {
             return this._tweens;
         },
@@ -231,22 +208,19 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _tweenRepetition:{
-        serializable:true,
         value:null
     },
 
     tweenRepetition:{
-        serializable:true,
         get:function () {
-            return this._spanRepetition;
+            return this._tweenRepetition;
         },
         set:function (newVal) {
-            this._spanRepetition = newVal;
+            this._tweenRepetition = newVal;
         }
     },
 
     _trackDuration:{
-        serializable: true,
         value:0
     },
 
@@ -265,7 +239,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _trackPosition:{
-        serializable:true,
         value:0
     },
 
@@ -281,7 +254,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _currentKeyframeRule:{
-        serializable: true,
         value:null
     },
 
@@ -305,7 +277,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _isTrackAnimated:{
-        serializable: true,
         value:null
     },
 
@@ -322,12 +293,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {