aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-12 10:54:34 -0700
committerValerio Virgillito2012-06-12 10:54:34 -0700
commit9da05185537e5f436bce58de0d6d516570b17494 (patch)
tree1777c1ec754cebb7844df18c56cc420813960b57
parent8e5536bddb9f9f991e1d5ed363d253879a159a28 (diff)
parent0a5ce26ee62b74261e1b00877b7e43af0e681856 (diff)
downloadninja-9da05185537e5f436bce58de0d6d516570b17494.tar.gz
Merge pull request #295 from jreid01/pullrequest-v10
Timeline: Update document switching to work under Montage v.10
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js1
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js3
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js28
3 files changed, 31 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index ed0200ae..6b64261e 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -456,6 +456,7 @@ var Layer = exports.Layer = Montage.create(Component, {
456 }, 456 },
457 457
458 layerData:{ 458 layerData:{
459 serializable: true,
459 get:function(){ 460 get:function(){
460 return this._layerData; 461 return this._layerData;
461 }, 462 },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 36b868d0..65476d6b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -783,6 +783,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
783 var i = 0, 783 var i = 0,
784 tlArrLayersLength = this.application.ninja.currentDocument.tlArrLayers.length; 784 tlArrLayersLength = this.application.ninja.currentDocument.tlArrLayers.length;
785 785
786
787 this._ignoreNextContainerChange = true;
788
786 // We're reading from the cache, not writing to it. 789 // We're reading from the cache, not writing to it.
787 this._boolCacheArrays = false; 790 this._boolCacheArrays = false;
788 for (i = 0; i < tlArrLayersLength; i++) { 791 for (i = 0; i < tlArrLayersLength; i++) {
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 : {