aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-26 11:49:48 -0700
committerJonathan Duran2012-03-26 11:49:48 -0700
commit5a977f2ac151766530c129e26edc39055d11c07f (patch)
treebae4d22bb9ea0782bcb4f665cb577ddcf40099eb /js
parente93827d6c157c7648eb52e6c10b7f458b215b580 (diff)
downloadninja-5a977f2ac151766530c129e26edc39055d11c07f.tar.gz
Fix bug with track properties getting over written
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js43
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js1
2 files changed, 29 insertions, 15 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 40af9af6..36b2fe08 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -28,6 +28,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
28 set:function (value) { 28 set:function (value) {
29 if (value !== this._trackID) { 29 if (value !== this._trackID) {
30 this._trackID = value; 30 this._trackID = value;
31 this.trackData.layerID = value;
31 } 32 }
32 } 33 }
33 }, 34 },
@@ -43,6 +44,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
43 set:function (newVal) { 44 set:function (newVal) {
44 if (newVal !== this._isMainCollapsed) { 45 if (newVal !== this._isMainCollapsed) {
45 this._isMainCollapsed = newVal; 46 this._isMainCollapsed = newVal;
47 this.trackData.isMainCollapsed = newVal;
46 } 48 }
47 } 49 }
48 }, 50 },
@@ -56,6 +58,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
56 set:function (newVal) { 58 set:function (newVal) {
57 if (newVal !== this._isTransformCollapsed) { 59 if (newVal !== this._isTransformCollapsed) {
58 this._isTransformCollapsed = newVal; 60 this._isTransformCollapsed = newVal;
61 this.trackData.isTransformCollapsed = newVal;
59 } 62 }
60 } 63 }
61 }, 64 },
@@ -69,6 +72,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
69 set:function (newVal) { 72 set:function (newVal) {
70 if (newVal !== this._isPositionCollapsed) { 73 if (newVal !== this._isPositionCollapsed) {
71 this._isPositionCollapsed = newVal; 74 this._isPositionCollapsed = newVal;
75 this.trackData.isPositionCollapsed = newVal;
72 } 76 }
73 } 77 }
74 }, 78 },
@@ -82,6 +86,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
82 set:function (newVal) { 86 set:function (newVal) {
83 if (newVal !== this._isStyleCollapsed) { 87 if (newVal !== this._isStyleCollapsed) {
84 this._isStyleCollapsed = newVal; 88 this._isStyleCollapsed = newVal;
89 this.trackData.isStyleCollapsed = newVal;
85 } 90 }
86 } 91 }
87 }, 92 },
@@ -97,10 +102,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
97 set: function(newVal) { 102 set: function(newVal) {
98 if (newVal !== this._bypassAnimation) { 103 if (newVal !== this._bypassAnimation) {
99 this._bypassAnimation = newVal; 104 this._bypassAnimation = newVal;
105 this.trackData.bypassAnimation = newVal;
100 } 106 }
101 if (this.trackData.bypassAnimation !== newVal) {
102 this.trackData.bypassAnimation = newVal;
103 }
104 } 107 }
105 }, 108 },
106 109
@@ -117,7 +120,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
117 }, 120 },
118 set: function(newVal) { 121 set: function(newVal) {
119 this._arrStyleTracks = newVal; 122 this._arrStyleTracks = newVal;
120 //this.needsDraw = true; 123 this.trackData.arrStyleTracks = newVal;
121 } 124 }
122 }, 125 },
123 _styleTracksRepetition: { 126 _styleTracksRepetition: {
@@ -131,7 +134,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
131 }, 134 },
132 set: function(newVal) { 135 set: function(newVal) {
133 this._styleTracksRepetition = newVal; 136 this._styleTracksRepetition = newVal;
134 //needsDraw = true;
135 } 137 }
136 }, 138 },
137 139
@@ -149,7 +151,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
149 }, 151 },
150 set: function(newVal) { 152 set: function(newVal) {
151 this._arrPositionTracks = newVal; 153 this._arrPositionTracks = newVal;
152 //this.needsDraw = true; 154 this.trackData.arrPositionTracks = newVal;
153 } 155 }
154 }, 156 },
155 _positionTracksRepetition: { 157 _positionTracksRepetition: {
@@ -163,7 +165,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
163 }, 165 },
164 set: function(newVal) { 166 set: function(newVal) {
165 this._positionTracksRepetition = newVal; 167 this._positionTracksRepetition = newVal;
166 //this.needsDraw = true;
167 } 168 }
168 }, 169 },
169 170
@@ -182,7 +183,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
182 }, 183 },
183 set: function(newVal) { 184 set: function(newVal) {
184 this._arrTransformTracks = newVal; 185 this._arrTransformTracks = newVal;
185 //this.needsDraw = true; 186 this.trackData.arrTransformTracks = newVal;
186 } 187 }
187 }, 188 },
188 _transformTracksRepetition: { 189 _transformTracksRepetition: {
@@ -196,7 +197,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
196 }, 197 },
197 set: function(newVal) { 198 set: function(newVal) {
198 this._transformTracksRepetition = newVal; 199 this._transformTracksRepetition = newVal;
199 //this.needsDraw = true;
200 } 200 }
201 }, 201 },
202 202
@@ -212,7 +212,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
212 }, 212 },
213 set:function (newVal) { 213 set:function (newVal) {
214 this._tweens = newVal; 214 this._tweens = newVal;
215 //this.needsDraw=true; 215 this.trackData.tweens = newVal;
216 } 216 }
217 }, 217 },
218 218
@@ -246,6 +246,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
246 if(this._trackDuration > this.application.ninja.timeline.masterDuration){ 246 if(this._trackDuration > this.application.ninja.timeline.masterDuration){
247 this.application.ninja.timeline.masterDuration = this._trackDuration; 247 this.application.ninja.timeline.masterDuration = this._trackDuration;
248 } 248 }
249 this.trackData.trackDuration = val;
249 } 250 }
250 }, 251 },
251 252
@@ -261,6 +262,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
261 }, 262 },
262 set:function (val) { 263 set:function (val) {
263 this._trackPosition = val; 264 this._trackPosition = val;
265 this.trackData.trackPosition = val;
264 } 266 }
265 }, 267 },
266 268
@@ -276,6 +278,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
276 }, 278 },
277 set:function(val){ 279 set:function(val){
278 this._currentKeyframeRule = val; 280 this._currentKeyframeRule = val;
281 this.trackData.currentKeyframeRule = val;
279 } 282 }
280 }, 283 },
281 284
@@ -299,21 +302,25 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
299 }, 302 },
300 set:function(val){ 303 set:function(val){
301 this._isTrackAnimated = val; 304 this._isTrackAnimated = val;
305 this.trackData.isTrackAnimated = val;
302 } 306 }
303 }, 307 },
304 308
305 // should be unneeded with one element per layer restriction 309 // should be unneeded with one element per layer restriction
306 _animatedElement:{ 310 _animatedElement:{
311 enumerable: true,
307 serializable:true, 312 serializable:true,
308 value:null 313 value:null
309 }, 314 },
310 animatedElement:{ 315 animatedElement:{
316 enumerable: true,
311 serializable:true, 317 serializable:true,
312 get:function () { 318 get:function () {
313 return this._animatedElement; 319 return this._animatedElement;
314 }, 320 },
315 set:function (val) { 321 set:function (val) {
316 this._animatedElement = val; 322 this._animatedElement = val;
323 this.trackData.animatedElement = val;
317 } 324 }