aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJon Reid2012-07-03 11:05:12 -0700
committerJon Reid2012-07-03 11:05:12 -0700
commitfd0f914b10e72b4acbc58330b3a59672ad667890 (patch)
tree61cae842381d81476f7d43fe620ae57fd641b25d /js/panels
parent040a99e4c20e53a4ed3841357ef5f28d78f3f8a2 (diff)
parentd39d712422a85e8671b84ae71d5249d917915f42 (diff)
downloadninja-fd0f914b10e72b4acbc58330b3a59672ad667890.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js588
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
11 11
12var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { 12var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
13 13
14 // ==== Begin Models
14 _trackID:{ 15 _trackID:{
15 value:null 16 value:null
16 }, 17 },
17
18 trackID:{ 18 trackID:{
19 serializable:true, 19 serializable:true,
20 get:function () { 20 get:function () {
@@ -31,7 +31,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
31 _tween:{ 31 _tween:{
32 value:[] 32 value:[]
33 }, 33 },
34
35 tween:{ 34 tween:{
36 serializable:true, 35 serializable:true,
37 get:function () { 36 get:function () {
@@ -53,7 +52,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
53 _isVisible:{ 52 _isVisible:{
54 value: true 53 value: true
55 }, 54 },
56
57 isVisible:{ 55 isVisible:{
58 get:function(){ 56 get:function(){
59 return this._isVisible; 57 return this._isVisible;
@@ -72,6 +70,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
72 this.trackData.isVisible = value; 70 this.trackData.isVisible = value;
73 } 71 }
74 }, 72 },
73
74 _bindingPoint : {
75 value : {}
76 },
77 bindingPoint: {
78 get: function() {
79 return this._bindingPoint;
80 },
81 set: function(newVal) {
82 if (newVal !== this._bindingPoint) {
83 this._bindingPoint = newVal;
84 this.setData();
85 }
86 }
87 },
75 88
76 _stageElement: { 89 _stageElement: {
77 value: null 90 value: null
@@ -86,7 +99,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
86 } 99 }
87 }, 100 },
88 101
89 // Are the various collapsers collapsed or not
90 _isMainCollapsed:{ 102 _isMainCollapsed:{
91 value: true 103 value: true
92 }, 104 },
@@ -99,18 +111,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
99 this.trackData.isMainCollapsed = newVal; 111 this.trackData.isMainCollapsed = newVal;
100 } 112 }
101 }, 113 },
102 _isTransformCollapsed:{ 114
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:{ 115 _isPositionCollapsed:{
115 value:true 116 value:true
116 }, 117 },
@@ -123,6 +124,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
123 this.trackData.isPositionCollapsed = newVal; 124 this.trackData.isPositionCollapsed = newVal;
124 } 125 }
125 }, 126 },
127
126 _isStyleCollapsed:{ 128 _isStyleCollapsed:{
127 value:true 129 value:true
128 }, 130 },
@@ -135,6 +137,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
135 this.trackData.isStyleCollapsed = newVal; 137 this.trackData.isStyleCollapsed = newVal;
136 } 138 }
137 }, 139 },
140
138 _bypassAnimation : { 141 _bypassAnimation : {
139 value: false 142 value: false
140 }, 143 },
@@ -164,6 +167,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
164 this.trackData.arrStyleTracks = newVal; 167 this.trackData.arrStyleTracks = newVal;
165 } 168 }
166 }, 169 },
170
167 _styleTracksRepetition: { 171 _styleTracksRepetition: {
168 value: null 172 value: null
169 }, 173 },
@@ -176,8 +180,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
176 this._styleTracksRepetition = newVal; 180 this._styleTracksRepetition = newVal;
177 } 181 }
178 }, 182 },
179 183
180 /* Position Property Tracks */
181 _arrPositionTracks : { 184 _arrPositionTracks : {
182 value: [] 185 value: []
183 }, 186 },
@@ -192,6 +195,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
192 195
193 } 196 }
194 }, 197 },
198
195 _positionTracksRepetition: { 199 _positionTracksRepetition: {
196 value: null 200 value: null
197 }, 201 },
@@ -204,26 +208,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
204 } 208 }
205 }, 209 },
206 210
207
208 /* Transform Property Tracks */
209 _arrTransformTracks : {
210 value: []
211 },
212 arrTransformTracks: {
213 serializable:true,
214 get: function() {
215 return this._arrTransformTracks;
216 },
217 set: function(newVal) {
218 this._arrTransformTracks = newVal;
219 this.trackData.arrTransformTracks = newVal;
220 }
221 },
222
223 _tweens:{ 211 _tweens:{
224 value:[] 212 value:[]
225 }, 213 },
226
227 tweens:{ 214 tweens:{
228 serializable: true, 215 serializable: true,
229 get:function () { 216 get:function () {
@@ -238,7 +225,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
238 _tweenRepetition:{ 225 _tweenRepetition:{
239 value:null 226 value:null
240 }, 227 },
241
242 tweenRepetition:{ 228 tweenRepetition:{
243 get:function () { 229 get:function () {
244 return this._tweenRepetition; 230 return this._tweenRepetition;
@@ -251,7 +237,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
251 _trackDuration:{ 237 _trackDuration:{
252 value:0 238 value:0
253 }, 239 },
254
255 trackDuration:{ 240 trackDuration:{
256 serializable:true, 241 serializable:true,
257 get:function () { 242 get:function () {
@@ -269,7 +254,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
269 _trackPosition:{ 254 _trackPosition:{
270 value:0 255 value:0
271 }, 256 },
272
273 trackPosition:{ 257 trackPosition:{
274 serializable:true, 258 serializable:true,
275 get:function () { 259 get:function () {
@@ -284,7 +268,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
284 _currentKeyframeRule:{ 268 _currentKeyframeRule:{
285 value:null 269 value:null
286 }, 270 },
287
288 currentKeyframeRule:{ 271 currentKeyframeRule:{
289 serializable: true, 272 serializable: true,