diff options
author | Valerio Virgillito | 2012-06-12 10:54:34 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-12 10:54:34 -0700 |
commit | 9da05185537e5f436bce58de0d6d516570b17494 (patch) | |
tree | 1777c1ec754cebb7844df18c56cc420813960b57 /js/panels/Timeline/TimelineTrack.reel | |
parent | 8e5536bddb9f9f991e1d5ed363d253879a159a28 (diff) | |
parent | 0a5ce26ee62b74261e1b00877b7e43af0e681856 (diff) | |
download | ninja-9da05185537e5f436bce58de0d6d516570b17494.tar.gz |
Merge pull request #295 from jreid01/pullrequest-v10
Timeline: Update document switching to work under Montage v.10
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 7cfe07a6..75997466 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -155,7 +155,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
155 | }, | 155 | }, |
156 | set: function(newVal) { | 156 | set: function(newVal) { |
157 | this._arrPositionTracks = newVal; | 157 | this._arrPositionTracks = newVal; |
158 | this.trackData.arrPositionTracks = newVal; | 158 | if (typeof(this.trackData) === "undefined") { |
159 | //this.createTrackData(); | ||
160 | } | ||
161 | this.trackData.arrPositionTracks = newVal; | ||
162 | |||
159 | } | 163 | } |
160 | }, | 164 | }, |
161 | _positionTracksRepetition: { | 165 | _positionTracksRepetition: { |
@@ -348,6 +352,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
348 | }, | 352 | }, |
349 | 353 | ||
350 | trackData:{ | 354 | trackData:{ |
355 | serializable: true, | ||
351 | get:function(){ | 356 | get:function(){ |
352 | return this._trackData; | 357 | return this._trackData; |
353 | }, | 358 | }, |
@@ -386,6 +391,27 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
386 | this.needsDraw = true; | 391 | this.needsDraw = true; |
387 | } | 392 | } |
388 | }, | 393 | }, |
394 | createTrackData: { | ||
395 | value: function() { | ||
396 | tempData = {}; | ||
397 | tempData.bypassAnimation = this.bypassAnimation; | ||
398 | tempData.trackID = this.layerID; | ||
399 | tempData.tweens = this.tweens; | ||
400 | tempData.animatedElement = this.animatedElement; | ||
401 | tempData.arrStyleTracks = this.arrStyleTracks; | ||
402 | tempData.isTrackAnimated = this.isTrackAnimated; | ||
403 | tempData.trackDuration = this.trackDuration; | ||
404 | tempData.animationName = this.animationName; | ||
405 | tempData.currentKeyframeRule = this.currentKeyframeRule; | ||
406 | tempData.isMainCollapsed = this.isMainCollapsed; | ||
407 | tempData.isPositionCollapsed = this.isPositionCollapsed; | ||
408 | tempData.isTransformCollapsed = this.isTransformCollapsed; | ||
409 | tempData.isStyleCollapsed = this.isStyleCollapsed; | ||
410 | tempData.trackPosition = this.trackPosition; | ||
411 | tempData.isVisible = this.isVisible; | ||
412 | this.trackData = tempData; | ||
413 | } | ||
414 | }, | ||
389 | 415 | ||
390 | // Data binding observation point and trigger method | 416 | // Data binding observation point and trigger method |
391 | _bindingPoint : { | 417 | _bindingPoint : { |