Timeline: Bug fix: Correctly maintain expand/collapse state of layers and

subproperties across document switching.

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, {
         },
         set: function(newVal) {
                 if (newVal !== this._easing) {
+                        if (typeof(newVal) === "undefined") {
+                                newVal = "ease-in";
+                        }
                         this._easing = newVal;
                         this.parentComponent.setKeyframeEase(newVal);
                         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, {
                 
                 // We're reading from the cache, not writing to it.
                 this._boolCacheArrays = false;
+                
+                // We are about to redraw the layers and tracks for the first time, so they need to go through their 
+                // respective firstDraw routines.
                 for (i = 0; i < tlArrLayersLength; i++) {
-                    if (this.application.ninja.currentDocument.tlArrLayers[i].layerData.isSelected === true) {
-                        this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = true;
-                    } else {
-                        this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = false;
-                    }
+                                        this.application.ninja.currentDocument.tlArrLayers[i].layerData._isFirstDraw = true;
                 }
                 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers;
                 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, {
             this._tween = newVal;
         }
     },
+    
+    _isFirstDraw: {
+        value: true
+    },
 
     _isVisible:{
         value: true