Fix bug with track properties getting over written

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

2 files changed, 29 insertions, 15 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 40af9af6..36b2fe08 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -28,6 +28,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (value) {
                 if (value !== this._trackID) {
                         this._trackID = value;
+                this.trackData.layerID = value;
                 }
         }
     },
@@ -43,6 +44,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._isMainCollapsed) {
                 this._isMainCollapsed = newVal;
+                this.trackData.isMainCollapsed = newVal;
             }
         }
     },
@@ -56,6 +58,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._isTransformCollapsed) {
                 this._isTransformCollapsed = newVal;
+                this.trackData.isTransformCollapsed = newVal;
             }
         }
     },
@@ -69,6 +72,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._isPositionCollapsed) {
                 this._isPositionCollapsed = newVal;
+                this.trackData.isPositionCollapsed = newVal;
             }
         }
     },
@@ -82,6 +86,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._isStyleCollapsed) {
                 this._isStyleCollapsed = newVal;
+                this.trackData.isStyleCollapsed = newVal;
             }
         }
     },
@@ -97,10 +102,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set: function(newVal) {
                 if (newVal !== this._bypassAnimation) {
                         this._bypassAnimation = newVal;
+                this.trackData.bypassAnimation = newVal;
                 }
-                        if (this.trackData.bypassAnimation !== newVal) {
-                                this.trackData.bypassAnimation = newVal;
-                        }
         }
     },
     
@@ -117,7 +120,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._arrStyleTracks = newVal;
-                //this.needsDraw = true;
+            this.trackData.arrStyleTracks = newVal;
         }
     },
     _styleTracksRepetition: {
@@ -131,7 +134,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._styleTracksRepetition = newVal;
-                //needsDraw = true;
         }
     },
     
@@ -149,7 +151,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._arrPositionTracks = newVal;
-                //this.needsDraw = true;
+            this.trackData.arrPositionTracks = newVal;
         }
     },
     _positionTracksRepetition: {
@@ -163,7 +165,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._positionTracksRepetition = newVal;
-                //this.needsDraw = true;
         }
     },
     
@@ -182,7 +183,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._arrTransformTracks = newVal;
-                //this.needsDraw = true;
+            this.trackData.arrTransformTracks = newVal;
         }
     },
     _transformTracksRepetition: {
@@ -196,7 +197,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._transformTracksRepetition = newVal;
-                //this.needsDraw = true;
         }
     },
 
@@ -212,7 +212,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function (newVal) {
             this._tweens = newVal;
-            //this.needsDraw=true;
+            this.trackData.tweens = newVal;
         }
     },
 
@@ -246,6 +246,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             if(this._trackDuration > this.application.ninja.timeline.masterDuration){
                 this.application.ninja.timeline.masterDuration = this._trackDuration;
             }
+            this.trackData.trackDuration = val;
         }
     },
 
@@ -261,6 +262,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function (val) {
             this._trackPosition = val;
+            this.trackData.trackPosition = val;
         }
     },
 
@@ -276,6 +278,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function(val){
             this._currentKeyframeRule = val;
+            this.trackData.currentKeyframeRule = val;
         }
     },
 
@@ -299,21 +302,25 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function(val){
             this._isTrackAnimated = val;
+            this.trackData.isTrackAnimated = val;
         }
     },
 
     // should be unneeded with one element per layer restriction
     _animatedElement:{
+        enumerable: true,
         serializable:true,
         value:null
     },
     animatedElement:{
+        enumerable: true,
         serializable:true,
         get:function () {
             return this._animatedElement;
         },
         set:function (val) {
             this._animatedElement = val;
+