From 0e24b9dc875cefb1010a9e2b507c19b77e4d9811 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 20 Mar 2012 17:37:11 -0700
Subject: Timeline: fix layer and style select problems.

---
 js/panels/Timeline/Layer.reel/Layer.html                 | 2 +-
 js/panels/Timeline/Layer.reel/Layer.js                   | 1 -
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 2 +-
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js   | 6 ++++++
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 79b522ee..c8e31fad 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -301,7 +301,7 @@
 					"properties" : {
 						"element" : {"#" : "content-style"},
 						"myContent" : {"#":"content-style"},
-						"contentHeight" : 60,
+						"contentHeight" : 0,
 						"isLabelClickable" : true,
 						"clicker" : {"#" : "clicker-style"},
 						"isCollapsed" : true,
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 830d179e..9334a0b4 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -714,7 +714,6 @@ var Layer = exports.Layer = Montage.create(Component, {
 		value: function(event) {
 			this.layerData.isActive = true;
 			var ptrParent = nj.queryParentSelector(event.target, ".content-style");
-			console.log('handleMousedown called')
 			if (ptrParent !== false) {
 				this.selectStyle(this.getActiveStyleIndex());
 			}
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 6e7d410c..2e0bf7dd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -19,7 +19,7 @@
                         "element": {"#": "timeline_panel"},
                         "user_layers": {"#": "user_layers"},
                         "track_container": {"#": "right_inside"},
-                        "timeline_leftpane" : {"#" : "timeline_leftpane"},
+                        "timeline_leftpane" : {"#" : "leftpane_inside"},
                         "layer_tracks": {"#": "layer_tracks"},
                         "master_track": {"#": "master_track"},
                         "time_markers" : {"#": "timeline_markers"},
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index df018ee3..67eae45c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -913,6 +913,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 } else {
                     this.arrLayers[i].layerData.isSelected = false;
                 }
+                
+	    		if (this.arrLayers[i].layerData.triggerBinding === true) {
+	    			this.arrLayers[i].layerData.triggerBinding = false;
+	    		} else {
+	    			this.arrLayers[i].layerData.triggerBinding = true;
+	    		}
             }
 
             this.layerRepetition.selectedIndexes = [layerIndex];
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 7e9b8a21..2d508b3c 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -200,7 +200,7 @@
 						"properties" : {
 							"element" : {"#" : "content-styles"},
 							"myContent" : {"#":"content-styles"},
-							"contentHeight" : 40,
+							"contentHeight" : 0,
 							"isLabelClickable" : false,
 							"clicker" : {"#" : "label-styles"},
 							"isCollapsed" : true,
-- 
cgit v1.2.3