Merge branch 'master' into brushtool

2 files changed, 1 insertions, 34 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 44ad9abb..5c5a8b76 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -15,7 +15,6 @@
                        "properties": {
                            "element": {"#": "track"},
                            "tweenRepetition" : {"@" : "tweenRepetition"},
-                           "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
                            "tween": {"@" : "tween"},
                            "_mainCollapser" : {"@" : "mainCollapser"},
                            "_positionCollapser" : {"@" : "positionCollapser"},
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index e46a5eb0..efeeba00 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
     },
 
@@ -105,7 +104,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _bypassAnimation : {
-        serializable: true,
         value: false
     },
     bypassAnimation : {
@@ -122,13 +120,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 +133,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _styleTracksRepetition: {
-        serializable: true,
         value: null
     },
     styleTracksRepetition : {
-        serializable: true,
         get: function() {
                 return this._styleTracksRepetition;
         },
@@ -153,13 +146,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 +159,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _positionTracksRepetition: {
-        serializable: true,
         value: null
     },
     positionTracksRepetition : {
-        serializable: true,
         get: function() {
                 return this._positionTracksRepetition;
         },
@@ -185,13 +173,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;
         },
@@ -201,11 +186,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _transformTracksRepetition: {
-        serializable: true,
         value: null
     },
     transformTracksRepetition : {
-        serializable: true,
         get: function() {
                 return this._transformTracksRepetition;
         },
@@ -215,12 +198,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _tweens:{
-        enumerable: false,
         value:[]
     },
 
     tweens:{
-        serializable:true,
+        serializable: true,
         get:function () {
             return this._tweens;
         },
@@ -231,12 +213,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _tweenRepetition:{
-        serializable:true,
         value:null
     },
 
     tweenRepetition:{
-        serializable:true,
         get:function () {
             return this._spanRepetition;
         },
@@ -246,7 +226,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _trackDuration:{
-        serializable: true,
         value:0
     },
 
@@ -265,7 +244,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _trackPosition:{
-        serializable:true,
         value:0
     },
 
@@ -281,7 +259,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _currentKeyframeRule:{
-        serializable: true,
         value:null
     },
 
@@ -305,7 +282,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     },
 
     _isTrackAnimated:{
-        serializable: true,