Merge branch 'master' of github.com:Motorola-Mobility/ninja

1 files changed, 443 insertions, 576 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index fc9f9cf3..56e5d2f1 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -36,27 +36,26 @@ 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 () {
             return this._trackID;
         },
         set:function (value) {
-            if (value !== this._trackID) {
-                this._trackID = value;
+                if (value !== this._trackID) {
+                        this._trackID = value;
                 this.trackData.layerID = value;
-            }
+                }
         }
     },
 
     _tween:{
         value:[]
     },
-
     tween:{
         serializable:true,
         get:function () {
@@ -70,48 +69,61 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     positionPropertyTrack:{
         value:null
     },
-
+    
     _isFirstDraw: {
-        value: true
+        value: true
     },
 
     _isVisible:{
         value: true
     },
-
     isVisible:{
         get:function(){
             return this._isVisible;
         },
         set:function(value){
-            if (this._isVisible !== value) {
-                this._isVisible = value;
-                if (this.element !== null) {
-                    if (value === true) {
-                        this.element.classList.remove("layer-hidden");
-                    } else {
-                        this.element.classList.add("layer-hidden");
-                    }
-                }
-            }
-            this.trackData.isVisible = value;
+                if (this._isVisible !== value) {
+                        this._isVisible = value;
+                        if (this.element !== null) {
+                                if (value === true) {
+                                        this.element.classList.remove("layer-hidden");
+                                } else {
+                                        this.element.classList.add("layer-hidden");
+                                }
+                        }
+                }
+                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
+        value: null
     },
     stageElement: {
-        get: function() {
-            return this._stageElement;
-        },
-        set: function(newVal) {
-            this._stageElement = newVal;
-            this.trackData.stageElement = newVal;
-        }
+        get: function() {
+                return this._stageElement;
+        },
+        set: function(newVal) {
+                this._stageElement = newVal;
+                this.trackData.stageElement = newVal;
+        }
     },
 
-    // Are the various collapsers collapsed or not
     _isMainCollapsed:{
         value: true
     },
@@ -124,18 +136,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
     },
@@ -148,6 +149,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.isPositionCollapsed = newVal;
         }
     },
+
     _isStyleCollapsed:{
         value:true
     },
@@ -160,97 +162,82 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.isStyleCollapsed = newVal;
         }
     },
+
     _bypassAnimation : {
-        value: false
+        value: false
     },
     bypassAnimation : {
-        serializable: true,
-        get: function() {
-            return this._bypassAnimation;
-        },
-        set: function(newVal) {
-            if (typeof(this.trackData) !== "undefined") {
-                this._bypassAnimation = newVal;
+        serializable: true,
+        get: function() {
+                return this._bypassAnimation;
+        },
+        set: function(newVal) {
+                if (typeof(this.trackData) !== "undefined") {
+                        this._bypassAnimation = newVal;
                 this.trackData.bypassAnimation = newVal;
-            }
-        }
+                }
+        }
     },
-
+    
     _arrStyleTracks : {
-        value: []
+        value: []
     },
     arrStyleTracks: {
         serializable:true,
-        get: function() {
-            return this._arrStyleTracks;
-        },
-        set: function(newVal) {
-            this._arrStyleTracks = newVal;
+        get: function() {
+                return this._arrStyleTracks;
+        },
+        set: function(newVal) {
+                this._arrStyleTracks = newVal;
             this.trackData.arrStyleTracks = newVal;
-        }
+        }