From 92cca9bf067d048c57aaab85479d36cb902c96c2 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 15 Jun 2012 14:31:48 -0700
Subject: Timeline: Bug fix: Correctly maintain expand/collapse state of layers
 and subproperties across document switching.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'js/panels/Timeline/TimelinePanel.reel')

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;
-- 
cgit v1.2.3


From 1f8cb3a25745e5eb07bffccb4f5d5958e595e740 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 15 Jun 2012 17:32:28 -0700
Subject: Timeline: Bug fix: Document switching no longer causes multiple
 styles to be added.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'js/panels/Timeline/TimelinePanel.reel')

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 3d109bc1..27b3537c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1934,6 +1934,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 			return false;
     	}
     },
+
+	getActiveLayerIndex: {
+		value: function() {
+			var i = 0,
+				returnVal = false,
+				arrLayersLength = this.arrLayers.length;
+			for (i = 0; i < arrLayersLength; i++) {
+				if (this.arrLayers[i].isSelected === true) {
+					returnVal = i;
+				}
+			}
+			return returnVal;
+		}
+	},
     /* === END: Controllers === */
    
     /* === BEGIN: Logging routines === */
-- 
cgit v1.2.3