From a725643eba157b3c37d9acd13c6fdd48379bb0df Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 1 Mar 2012 10:38:47 -0800
Subject: Timeline: Merge. Set collapser heights.

---
 js/panels/Timeline/Layer.reel/Layer.html |  2 ++
 js/panels/Timeline/Layer.reel/Layer.js   | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 0bd448f7..cba963b6 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -226,6 +226,8 @@
 	                    }
 	                }
 				}
+				
+				
             }
         </script>
 	</head>
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index d50360e6..3e016c0c 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -418,7 +418,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 				defaultEventManager.dispatchEvent(newEvent);
 				that.isMainCollapsed = that.mainCollapser.isCollapsed;
             }
-    		this.mainCollapser.needsDraw = true;
+    		//this.mainCollapser.needsDraw = true;
 
             this.positionCollapser.clicker = this.clickerPosition;
             this.positionCollapser.myContent = this.contentPosition;
@@ -437,7 +437,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 				defaultEventManager.dispatchEvent(newEvent);
 				that.isPositionCollapsed = that.positionCollapser.isCollapsed;
             }
-            this.positionCollapser.needsDraw = true;
+            //this.positionCollapser.needsDraw = true;
             
             this.transformCollapser.clicker = this.clickerTransform;
             this.transformCollapser.myContent = this.contentTransform;
@@ -456,13 +456,13 @@ var Layer = exports.Layer = Montage.create(Component, {
 				defaultEventManager.dispatchEvent(newEvent);
 				that.isTransformCollapsed = that.transformCollapser.isCollapsed;
             }
-            this.transformCollapser.needsDraw = true;
+            //this.transformCollapser.needsDraw = true;
             
             this.styleCollapser.clicker = this.clickerStyle;
             this.styleCollapser.myContent = this.contentStyle;
             this.styleCollapser.element = this.element;
             this.styleCollapser.isCollapsed = this.isStyleCollapsed;
-            this.styleCollapser.contentHeight = 20;
+            this.styleCollapser.contentHeight = 0;
             this.styleCollapser.isAnimated = true;
             this.styleCollapser.labelClickEvent = function(boolBypass) {
 				var newEvent = document.createEvent("CustomEvent");
@@ -474,7 +474,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 				defaultEventManager.dispatchEvent(newEvent);
 				that.isStyleCollapsed = that.styleCollapser.isCollapsed;
             }
-            this.styleCollapser.needsDraw = true;
+            //this.styleCollapser.needsDraw = true;
 
             // Add event listeners to add and delete style buttons
             this.buttonAddStyle.identifier = "addStyle";
@@ -485,7 +485,7 @@ var Layer = exports.Layer = Montage.create(Component, {
             
             // Add mousedown listener to set isActive
             this.element.addEventListener("mousedown", this, false);
-            //this.element.addEventListener("click", this, false);
+            this.element.addEventListener("click", this, false);
 
         }
     },
-- 
cgit v1.2.3