Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 262 insertions, 365 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index b1e8af8a..f443553c 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1,8 +1,32 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
@@ -11,10 +35,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 +55,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _tween:{
         value:[]
     },
-
     tween:{
         serializable:true,
         get:function () {
@@ -53,7 +76,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _isVisible:{
         value: true
     },
-
     isVisible:{
         get:function(){
             return this._isVisible;
@@ -72,6 +94,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 +123,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
-    // Are the various collapsers collapsed or not
     _isMainCollapsed:{
         value: true
     },
@@ -99,18 +135,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 +148,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.isPositionCollapsed = newVal;
         }
     },
+
     _isStyleCollapsed:{
         value:true
     },
@@ -135,6 +161,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.isStyleCollapsed = newVal;
         }
     },
+
     _bypassAnimation : {
         value: false
     },
@@ -164,6 +191,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.trackData.arrStyleTracks = newVal;
         }
     },
+
     _styleTracksRepetition: {
         value: null
     },
@@ -176,8 +204,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this._styleTracksRepetition = newVal;
         }
     },
-    
-    /* Position Property Tracks */
+
     _arrPositionTracks : {
         value: []
     },
@@ -192,6 +219,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             
         }
     },
+
     _positionTracksRepetition: {
         value: null
     },
@@ -204,26 +232,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:[]
     },