2 files changed, 138 insertions, 49 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 7e9b8a21..2d508b3c 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -200,7 +200,7 @@
                                                 "properties" : {
                                                         "element" : {"#" : "content-styles"},
                                                         "myContent" : {"#":"content-styles"},
-                                                        "contentHeight" : 40,
+                                                        "contentHeight" : 0,
                                                         "isLabelClickable" : false,
                                                         "clicker" : {"#" : "label-styles"},
                                                         "isCollapsed" : true,
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index c6b67c9c..edca4306 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -26,8 +26,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             return this._trackID;
         },
         set:function (value) {
-            this._trackID = value;
-            //this.needsDraw = true;
+                if (value !== this._trackID) {
+                        this._trackID = value;
+                this.trackData.layerID = value;
+                }
         }
     },
 
@@ -40,11 +42,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             return this._isMainCollapsed;
         },
         set:function (newVal) {
-                this.log('TimelineTrack.js: isMainCollapsed: ', newVal);
             if (newVal !== this._isMainCollapsed) {
                 this._isMainCollapsed = newVal;
+                this.trackData.isMainCollapsed = newVal;
             }
-
         }
     },
     _isTransformCollapsed:{
@@ -57,6 +58,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._isTransformCollapsed) {
                 this._isTransformCollapsed = newVal;
+                this.trackData.isTransformCollapsed = newVal;
             }
         }
     },
@@ -70,6 +72,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._isPositionCollapsed) {
                 this._isPositionCollapsed = newVal;
+                this.trackData.isPositionCollapsed = newVal;
             }
         }
     },
@@ -83,6 +86,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._isStyleCollapsed) {
                 this._isStyleCollapsed = newVal;
+                this.trackData.isStyleCollapsed = newVal;
             }
         }
     },
@@ -96,8 +100,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 return this._bypassAnimation;
         },
         set: function(newVal) {
-                //console.log("timelinetrack bypassAnimation setter " + newVal)
-                this._bypassAnimation = newVal;
+                if ((newVal !== this._bypassAnimation) && (typeof(this.trackData) !== "undefined")) {
+                        this._bypassAnimation = newVal;
+                this.trackData.bypassAnimation = newVal;
+                }
         }
     },
     
@@ -114,7 +120,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._arrStyleTracks = newVal;
-                //this.needsDraw = true;
+            this.trackData.arrStyleTracks = newVal;
         }
     },
     _styleTracksRepetition: {
@@ -128,7 +134,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._styleTracksRepetition = newVal;
-                //needsDraw = true;
         }
     },
     
@@ -146,7 +151,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._arrPositionTracks = newVal;
-                //this.needsDraw = true;
+            this.trackData.arrPositionTracks = newVal;
         }
     },
     _positionTracksRepetition: {
@@ -160,7 +165,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._positionTracksRepetition = newVal;
-                //this.needsDraw = true;
         }
     },
     
@@ -179,7 +183,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._arrTransformTracks = newVal;
-                //this.needsDraw = true;
+            this.trackData.arrTransformTracks = newVal;
         }
     },
     _transformTracksRepetition: {
@@ -193,7 +197,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._transformTracksRepetition = newVal;
-                //this.needsDraw = true;
         }
     },
 
@@ -209,7 +212,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function (newVal) {
             this._tweens = newVal;
-            //this.needsDraw=true;
+            this.trackData.tweens = newVal;
         }
     },
 
@@ -243,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;
         }
     },
 
@@ -258,6 +262,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function (val) {
             this._trackPosition = val;
+            this.trackData.trackPosition = val;
         }
     },
 
@@ -273,6 +278,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function(val){
             this._currentKeyframeRule = val;
+            this.trackData.currentKeyframeRule = val;
         }
     },
 
@@ -296,21 +302,25 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         },
         set:function(val){
             this._isTrackAnimated = val;
+            this.trackData.isTrackAni