aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorKruti Shah2012-07-09 11:30:37 -0700
committerKruti Shah2012-07-09 11:30:37 -0700
commit35a31845720beb1296dc42a79fa068601dfc52cb (patch)
tree252ba58a3f2bb9600262c48571cc3dabaee36449 /js/panels/Timeline/TimelineTrack.reel
parentb35edd96135bd8c2b500ffee08474bacd17c25ac (diff)
parent39aa69624e1e3b8598b0242ee6ec436862b67280 (diff)
downloadninja-35a31845720beb1296dc42a79fa068601dfc52cb.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html34
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js627
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css32
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss32
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 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3Copyright (c) 2012, Motorola Mobility, Inc
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4All Rights Reserved.
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5BSD License.
6 </copyright> --> 6
7Redistribution and use in source and binary forms, with or without
8modification, 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
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY 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/> 2Copyright (c) 2012, Motorola Mobility, Inc
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3All Rights Reserved.
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4BSD License.
5 </copyright> */ 5
6Redistribution and use in source and binary forms, with or without
7modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */
6 30
7var Montage = require("montage/core/core").Montage; 31var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 32var Component = require("montage/ui/component").Component;
@@ -11,10 +35,10 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
11 35
12var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { 36var 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;