4 files changed, 347 insertions, 378 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 658764c8..1889e41b 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,9 +1,33 @@
 <!DOCTYPE html>
 <!-- <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+Copyright (c) 2012, Motorola Mobility, Inc
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+All Rights Reserved.
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+BSD License.
- </copyright> -->
+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> -->
 <html lang="en">
        <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -216,4 +240,4 @@
        </div>
    </body>
-</html>
-\ No newline at end of file
+</html>
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/>
+Copyright (c) 2012, Motorola Mobility, Inc
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+All Rights Reserved.
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+BSD License.
- </copyright> */
+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

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 658764c8..1889e41b 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,9 +1,33 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<!-- <copyright>	2	<!-- <copyright>
3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	3	Copyright (c) 2012, Motorola Mobility, Inc
4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	4	All Rights Reserved.
5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	5	BSD License.
6	</copyright> -->	6
		7	Redistribution and use in source and binary forms, with or without
		8	modification, are permitted provided that the following conditions are met:
		9
		10	- Redistributions of source code must retain the above copyright notice,
		11	this list of conditions and the following disclaimer.
		12	- Redistributions in binary form must reproduce the above copyright
		13	notice, this list of conditions and the following disclaimer in the
		14	documentation and/or other materials provided with the distribution.
		15	- Neither the name of Motorola Mobility nor the names of its contributors
		16	may be used to endorse or promote products derived from this software
		17	without specific prior written permission.
		18
		19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		26	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		27	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		29	POSSIBILITY OF SUCH DAMAGE.
		30	</copyright> -->
7	<html lang="en">	31	<html lang="en">
8	<head>	32	<head>
9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -216,4 +240,4 @@
216	</div>	240	</div>
217		241
218	</body>	242	</body>
219	</html> \ No newline at end of file	243	</html>


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 @@
1	/* <copyright>	1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	2	Copyright (c) 2012, Motorola Mobility, Inc
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	3	All Rights Reserved.
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	BSD License.
5	</copyright> */	5
		6	Redistribution and use in source and binary forms, with or without
		7	modification, are permitted provided that the following conditions are met:
		8
		9	- Redistributions of source code must retain the above copyright notice,
		10	this list of conditions and the following disclaimer.
		11	- Redistributions in binary form must reproduce the above copyright
		12	notice, this list of conditions and the following disclaimer in the
		13	documentation and/or other materials provided with the distribution.
		14	- Neither the name of Motorola Mobility nor the names of its contributors
		15	may be used to endorse or promote products derived from this software
		16	without specific prior written permission.
		17
		18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		28	POSSIBILITY OF SUCH DAMAGE.
		29	</copyright> */
6		30
7	var Montage = require("montage/core/core").Montage;	31	var Montage = require("montage/core/core").Montage;
8	var Component = require("montage/ui/component").Component;	32	var Component = require("montage/ui/component").Component;
@@ -11,10 +35,10 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
11		35
12	var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {	36	var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
13		37
		38	// ==== Begin Models
14	_trackID:{	39	_trackID:{
15	value:null	40	value:null
16	},	41	},
17
18	trackID:{	42	trackID:{
19	serializable:true,	43	serializable:true,
20	get:function () {	44	get:function () {
@@ -31,7 +55,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
31	_tween:{	55	_tween:{
32	value:[]	56	value:[]
33	},	57	},
34
35	tween:{	58	tween:{
36	serializable:true,	59	serializable:true,
37	get:function () {	60	get:function () {
@@ -53,7 +76,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
53	_isVisible:{	76	_isVisible:{
54	value: true	77	value: true
55	},	78	},
56
57	isVisible:{	79	isVisible:{
58	get:function(){	80	get:function(){
59	return this._isVisible;	81	return this._isVisible;
@@ -72,6 +94,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
72	this.trackData.isVisible = value;	94	this.trackData.isVisible = value;
73	}	95	}
74	},	96	},
		97
		98	_bindingPoint : {
		99	value : {}
		100	},
		101	bindingPoint: {
		102	get: function() {
		103	return this._bindingPoint;
		104	},
		105	set: function(newVal) {
		106	if (newVal !== this._bindingPoint) {
		107	this._bindingPoint = newVal;
		108	this.setData();
		109	}
		110	}
		111	},
75		112
76	_stageElement: {	113	_stageElement: {
77	value: null	114	value: null
@@ -86,7 +123,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
86	}	123	}
87	},	124	},
88		125
89	// Are the various collapsers collapsed or not
90	_isMainCollapsed:{	126	_isMainCollapsed:{
91	value: true	127	value: true
92	},	128	},
@@ -99,18 +135,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
99	this.trackData.isMainCollapsed = newVal;	135	this.trackData.isMainCollapsed = newVal;
100	}	136	}
101	},	137	},
102	_isTransformCollapsed:{	138
103	value:true
104	},
105	isTransformCollapsed:{
106	get:function () {
107	return this._isTransformCollapsed;
108	},
109	set:function (newVal) {
110	this._isTransformCollapsed = newVal;
111	this.trackData.isTransformCollapsed = newVal;
112	}
113	},
114	_isPositionCollapsed:{	139	_isPositionCollapsed:{
115	value:true	140	value:true
116	},	141	},
@@ -123,6 +148,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
123	this.trackData.isPositionCollapsed = newVal;	148	this.trackData.isPositionCollapsed = newVal;
124	}	149	}
125	},	150	},
		151
126	_isStyleCollapsed:{	152	_isStyleCollapsed:{
127	value:true	153	value:true
128	},	154	},
@@ -135,6 +161,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
135	this.trackData.isStyleCollapsed = newVal;	161	this.trackData.isStyleCollapsed = newVal;
136	}	162	}
137	},	163	},
		164
138	_bypassAnimation : {	165	_bypassAnimation : {
139	value: false	166	value: false
140	},	167	},
@@ -164,6 +191,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
164	this.trackData.arrStyleTracks = newVal;	191	this.trackData.arrStyleTracks = newVal;
165	}	192	}
166	},	193	},
		194
167	_styleTracksRepetition: {	195	_styleTracksRepetition: {
168	value: null	196	value: null