Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

1 files changed, 229 insertions, 359 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 8953888b..9f2b2eb0 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -11,10 +11,10 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
 
 var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
+    // ==== Begin Models
     _trackID:{
         value:null
     },
-
     trackID:{
         serializable:true,
         get:function () {
@@ -31,7 +31,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _tween:{
         value:[]
     },
-
     tween:{
         serializable:true,
         get:function () {
@@ -53,7 +52,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _isVisible:{
         value: true
     },
-
     isVisible:{
         get:function(){
             return this._isVisible;
@@ -72,6 +70,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this.trackData.isVisible = value;
         }
     },
+
+        _bindingPoint : {
+        value : {}
+    },
+    bindingPoint: {
+        get: function() {
+                return this._bindingPoint;
+        },
+        set: function(newVal) {
+                if (newVal !== this._bindingPoint) {
+                        this._bindingPoint = newVal;
+                        this.setData();
+                }
+        }
+    },
     
     _stageElement: {
         value: null
@@ -86,7 +99,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
-    // Are the various collapsers collapsed or not
     _isMainCollapsed:{
         value: true
     },
@@ -99,18 +111,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.isMainCollapsed = newVal;
         }
     },
-    _isTransformCollapsed:{
-        value:true
-    },
-    isTransformCollapsed:{
-        get:function () {
-            return this._isTransformCollapsed;
-        },
-        set:function (newVal) {
-            this._isTransformCollapsed = newVal;
-            this.trackData.isTransformCollapsed = newVal;
-        }
-    },
+
     _isPositionCollapsed:{
         value:true
     },
@@ -123,6 +124,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.isPositionCollapsed = newVal;
         }
     },
+
     _isStyleCollapsed:{
         value:true
     },
@@ -135,6 +137,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.isStyleCollapsed = newVal;
         }
     },
+
     _bypassAnimation : {
         value: false
     },
@@ -164,6 +167,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.arrStyleTracks = newVal;
         }
     },
+
     _styleTracksRepetition: {
         value: null
     },
@@ -176,8 +180,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this._styleTracksRepetition = newVal;
         }
     },
-    
-    /* Position Property Tracks */
+
     _arrPositionTracks : {
         value: []
     },
@@ -192,6 +195,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             
         }
     },
+
     _positionTracksRepetition: {
         value: null
     },
@@ -204,26 +208,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
-
-    /* Transform Property Tracks */
-    _arrTransformTracks : {
-        value: []
-    },
-    arrTransformTracks: {
-        serializable:true,
-        get: function() {
-                return this._arrTransformTracks;
-        },
-        set: function(newVal) {
-                this._arrTransformTracks = newVal;
-            this.trackData.arrTransformTracks = newVal;
-        }
-    },
-
     _tweens:{
         value:[]
     },
-
     tweens:{
         serializable: true,
         get:function () {
@@ -238,7 +225,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _tweenRepetition:{
         value:null
     },
-
     tweenRepetition:{
         get:function () {
             return this._tweenRepetition;
@@ -251,7 +237,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _trackDuration:{
         value:0
     },
-
     trackDuration:{
         serializable:true,
         get:function () {
@@ -269,7 +254,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _trackPosition:{
         value:0
     },
-
     trackPosition:{
         serializable:true,
         get:function () {
@@ -284,7 +268,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _currentKeyframeRule:{
         value:null
     },
-
     currentKeyframeRule:{