From aa2d8afb323e71ea562c74564609604e0480fde4 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 19 Mar 2012 16:53:29 -0700
Subject: Timeline: Re-enable adding/removing styles to layers. New methods in
 TimelinePanel for creating new styles on document load.

---
 js/panels/Timeline/Layer.reel/Layer.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 238ddae9..830d179e 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -499,11 +499,8 @@ var Layer = exports.Layer = Montage.create(Component, {
 
 
             // Add event listeners to add and delete style buttons
-            this.buttonAddStyle.identifier = "addStyle";
-            this.buttonAddStyle.addEventListener("click", this, false);
-            
-            this.buttonDeleteStyle.identifier = "deleteStyle";
-            this.buttonDeleteStyle.addEventListener("click", this, false);
+            this.buttonAddStyle.addEventListener("click", this.handleAddStyleClick.bind(this), false);
+            this.buttonDeleteStyle.addEventListener("click", this.handleDeleteStyleClick.bind(this), false);
             
             // Add mousedown listener to set isActive
             this.element.addEventListener("mousedown", this, false);
@@ -604,7 +601,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 			// Set up the event info and dispatch the event
 
 			newEvent.styleSelection = mySelection;
-			//defaultEventManager.dispatchEvent(newEvent);
+			defaultEventManager.dispatchEvent(newEvent);
 
 		}
 	},
@@ -624,7 +621,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 					newEvent.layerID = this.layerID;
 					newEvent.styleID = this.arrLayerStyles[selectedIndex].styleID;
 					newEvent.styleSelection = selectedIndex;
-					//defaultEventManager.dispatchEvent(newEvent);
+					defaultEventManager.dispatchEvent(newEvent);
 					
 					// Delete the style from the view
 					this.arrLayerStyles.splice(selectedIndex, 1);
@@ -717,6 +714,7 @@ 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());
 			}
-- 
cgit v1.2.3


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.js | 1 -
 1 file changed, 1 deletion(-)

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

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());
 			}
-- 
cgit v1.2.3


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 +++
 1 file changed, 3 insertions(+)

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

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 : {
-- 
cgit v1.2.3


From 2d9cb9ca8f6beb661a3d904b5125afa8243661de Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 21 Mar 2012 15:40:33 -0700
Subject: Timeline: First integration of drag and drop of layers.

---
 js/panels/Timeline/Layer.reel/Layer.js | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index fcdbcd22..bddfcd3e 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -505,6 +505,9 @@ 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);
+            
+			// Drag and drop event hanlders
+			this.element.addEventListener("dropped", this, false);
 
         }
     },
@@ -783,6 +786,11 @@ var Layer = exports.Layer = Montage.create(Component, {
 			this.triggerOutgoingBinding();
 		}
 	},
+	handleDropped : {
+		value: function(event) {
+			console.log('wheeee!  WWEWWEWWWWEEEEEEEEE')
+		}
+	},
 	/* End: Event handlers */
 	
 	/* Begin: Logging routines */
-- 
cgit v1.2.3