aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Reid2012-06-15 14:31:48 -0700
committerJon Reid2012-06-15 14:31:48 -0700
commit92cca9bf067d048c57aaab85479d36cb902c96c2 (patch)
treea42bc004bb0b3393c3c2234dd8f1f70959046a6f
parent0639b36bd4dc9c4c7659b87c05a22a08a4c49221 (diff)
downloadninja-92cca9bf067d048c57aaab85479d36cb902c96c2.tar.gz
Timeline: Bug fix: Correctly maintain expand/collapse state of layers and
subproperties across document switching.
-rw-r--r--js/panels/Timeline/Span.reel/Span.js3
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js9
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
3 files changed, 11 insertions, 5 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index 5b0f3f94..59cd13ed 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -67,6 +67,9 @@ var Span = exports.Span = Montage.create(Component, {
67 }, 67 },
68 set: function(newVal) { 68 set: function(newVal) {
69 if (newVal !== this._easing) { 69 if (newVal !== this._easing) {
70 if (typeof(newVal) === "undefined") {
71 newVal = "ease-in";
72 }
70 this._easing = newVal; 73 this._easing = newVal;
71 this.parentComponent.setKeyframeEase(newVal); 74 this.parentComponent.setKeyframeEase(newVal);
72 this.needsDraw = true; 75 this.needsDraw = true;
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index bb3ff170..3d109bc1 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -933,12 +933,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
933 933
934 // We're reading from the cache, not writing to it. 934 // We're reading from the cache, not writing to it.
935 this._boolCacheArrays = false; 935 this._boolCacheArrays = false;
936
937 // We are about to redraw the layers and tracks for the first time, so they need to go through their
938 // respective firstDraw routines.
936 for (i = 0; i < tlArrLayersLength; i++) { 939 for (i = 0; i < tlArrLayersLength; i++) {
937 if (this.application.ninja.currentDocument.tlArrLayers[i].layerData.isSelected === true) { 940 this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = true;
938 this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = true;
939 } else {
940 this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = false;
941 }
942 } 941 }
943 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers; 942 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers;
944 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber; 943 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 9276a7df..6e09bb64 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -41,6 +41,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
41 this._tween = newVal; 41 this._tween = newVal;
42 } 42 }
43 }, 43 },
44
45 _isFirstDraw: {
46 value: true
47 },
44 48
45 _isVisible:{ 49 _isVisible:{
46 value: true 50 value: true