From 8c1fda5e59b9d88b69e0b4a2bd57590ef451643c Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 1 May 2012 15:28:05 -0700
Subject: Timeline: Expand/collapse state of layers now mantained across
 document switching.

---
 js/panels/Timeline/Collapser.js                    |  2 --
 js/panels/Timeline/Layer.reel/Layer.js             | 31 ++++++++++++++++++++-
 .../Timeline/TimelineTrack.reel/TimelineTrack.js   | 32 ++++++++++++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)

(limited to 'js/panels')

diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 88314c8b..9c8d4434 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.js
@@ -151,7 +151,6 @@ var Montage = require("montage/core/core").Montage,
 
 	// isToggling: Bindable property. Set this (to anything) to trigger a toggle.
 	_isToggling: {
-		serializable: true,
 		value: true
 	},
 	isToggling: {
@@ -179,7 +178,6 @@ var Montage = require("montage/core/core").Montage,
 	
 	prepareForDraw: {
 		value: function() {
-
 			// Get the original value of the overflow property:
 			this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow");
 			if (this.isCollapsed === false) {
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index b23da749..34c300df 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -471,7 +471,7 @@ var Layer = exports.Layer = Montage.create(Component, {
             this.dtextScaleX = this.layerData.dtextScaleX;
             this.dtextScaleY = this.layerData.dtextScaleY;
             this.dtextRotate = this.layerData.dtextRotate;
-            this._isFirstDraw = this.layerData._isFirstDraw;
+            //this._isFirstDraw = this.layerData._isFirstDraw;
             this.layerTag = this.layerData.layerTag;
             this.isVisible = this.layerData.isVisible;
             this.isAnimated = this.layerData.isAnimated;
@@ -545,6 +545,9 @@ var Layer = exports.Layer = Montage.create(Component, {
 			this.element.addEventListener("dragleave", this.handleDragleave.bind(this), false);
 			this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
 			this.element.addEventListener("drop", this.handleDrop.bind(this), false);
+			
+
+
         }
     },
     draw: {
@@ -570,7 +573,33 @@ var Layer = exports.Layer = Montage.create(Component, {
     			}
     			this._isFirstDraw = false;
     			this.layerData._isFirstDraw = false;
+	    		
+	    		if (this.isMainCollapsed === false) {
+					this.mainCollapser.myContent.style.height = "auto";
+					this.mainCollapser.myContent.classList.remove(this.mainCollapser.collapsedClass);
+					this.mainCollapser.clicker.classList.remove(this.mainCollapser.collapsedClass);
+
+	    		}
+	    		if (this.isPositionCollapsed === false) {
+					this.positionCollapser.myContent.style.height = "auto";
+					this.positionCollapser.myContent.classList.remove(this.positionCollapser.collapsedClass);
+					this.positionCollapser.clicker.classList.remove(this.positionCollapser.collapsedClass);
+	    		}
+	    		if (this.isTransformCollapsed === false) {
+					this.transformCollapser.myContent.style.height = "auto";
+					this.transformCollapser.myContent.classList.remove(this.transformCollapser.collapsedClass);
+					this.transformCollapser.clicker.classList.remove(this.transformCollapser.collapsedClass);
+	    		}
+	    		if (this.isStyleCollapsed === false) {
+					this.styleCollapser.myContent.style.height = "auto";
+					this.styleCollapser.myContent.classList.remove(this.styleCollapser.collapsedClass);
+					this.styleCollapser.clicker.classList.remove(this.styleCollapser.collapsedClass);
+	    		}
+    			
     		}
+    		
+
+    		
     	}
     },
 	/* End: Draw cycle */
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index efeeba00..f32592ed 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -31,6 +31,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         	}
         }
     },
+    
+    _isFirstDraw: {
+    	value: true
+    },
+    
     _isVisible:{
         value: true
     },
@@ -448,6 +453,33 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                     }
                 }
             }
+            
+            
+    		if (this._isFirstDraw === true) {
+	    		
+	    		if (this.isMainCollapsed === false) {
+					this._mainCollapser.myContent.style.height = "auto";
+					this._mainCollapser.myContent.classList.remove(this._mainCollapser.collapsedClass);
+					this._mainCollapser.clicker.classList.remove(this._mainCollapser.collapsedClass);
+	    		}
+	    		if (this.isPositionCollapsed === false) {
+					this._positionCollapser.myContent.style.height = "auto";
+					this._positionCollapser.myContent.classList.remove(this._positionCollapser.collapsedClass);
+					this._positionCollapser.clicker.classList.remove(this._positionCollapser.collapsedClass);
+	    		}
+	    		if (this.isTransformCollapsed === false) {
+					this._transformCollapser.myContent.style.height = "auto";
+					this._transformCollapser.myContent.classList.remove(this._transformCollapser.collapsedClass);
+					this._transformCollapser.clicker.classList.remove(this._transformCollapser.collapsedClass);
+	    		}
+	    		if (this.isStyleCollapsed === false) {
+					this._styleCollapser.myContent.style.height = "auto";
+					this._styleCollapser.myContent.classList.remove(this._styleCollapser.collapsedClass);
+					this._styleCollapser.clicker.classList.remove(this._styleCollapser.collapsedClass);
+	    		}
+    			this._isFirstDraw = false;
+    		}
+            
         }
     },
 
-- 
cgit v1.2.3