From 3669eea4bde3518ce080048e9f53d2dd111fd8be Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 21 Mar 2012 11:37:48 -0700
Subject: Timeline: Bug fix: style collapsers not staying in synch. Also,
 removed console.log calls in hintable component.

---
 js/panels/Timeline/Layer.reel/Layer.js                 |  3 +++
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 16 +++++++++++-----
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js |  4 ++--
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 9334a0b4..fcdbcd22 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -571,6 +571,8 @@ var Layer = exports.Layer = Montage.create(Component, {
 				newEvent = document.createEvent("CustomEvent");
 			
 			this.isStyleCollapsed = false;
+			this.layerData.isStyleCollapsed = false;
+			this.triggerOutgoingBinding();
 			
 			newEvent.initCustomEvent("layerEvent", false, true);
 			newEvent.layerEventLocale = "styles";
@@ -603,6 +605,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 			newEvent.styleSelection = mySelection;
 			defaultEventManager.dispatchEvent(newEvent);
 
+
 		}
 	},
 	deleteStyle : {
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 03d06d98..0ba49c44 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -915,11 +915,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     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.triggerLayerBinding(i);
             }
 
             this.layerRepetition.selectedIndexes = [layerIndex];
@@ -1077,6 +1073,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             }
         }
     },
+    // Trigger the layer/track data binding
+    triggerLayerBinding : {
+    	value: function(intIndex) {
+    		if (this.arrLayers[intIndex].layerData.triggerBinding === true) {
+    			this.arrLayers[intIndex].layerData.triggerBinding = false;
+    		} else {
+    			this.arrLayers[intIndex].layerData.triggerBinding = true;
+    		}
+    	}
+    },
     /* === END: Controllers === */
 
     /* === BEGIN: Logging routines === */
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index e9a2115a..011d991e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -672,8 +672,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             } else if (layerEvent.layerEventType === "newStyle") {
             	this.arrStyleTracks.push("1");
             	if (this._styleCollapser.isCollapsed === true) {
-	                this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
-	                this._styleCollapser.handleCollapserLabelClick();
+	                //this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
+	                //this._styleCollapser.handleCollapserLabelClick();
             	}
             } else if (layerEvent.layerEventType === "deleteStyle") {
             	this.arrStyleTracks.pop();
-- 
cgit v1.2.3