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/TimelinePanel.reel/TimelinePanel.html | 2 +-
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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

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