From dc93269cfa7c315d22d85c8217e2412749643f28 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 22:51:10 -0700
Subject: Removing unused components references

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.html | 4 +---
 1 file changed, 1 insertion(+), 3 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 10334b31..9288d718 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -17,14 +17,12 @@
 						"styleRepetition" : {"@":"repetition1"},
 						"dynamicLayerName" : {"@":"dtext1"},
 						"dynamicLayerTag" : {"@": "dtext2"},
-						"slotStyle" : {"@":"slot1"},
 						"mainCollapser" : {"@" : "mainCollapser"},
 						"positionCollapser" : {"@" : "positionCollapser"},
 						"transformCollapser" : {"@" : "transformCollapser"},
 						"styleCollapser" : {"@" : "styleCollapser"},
 						"clickerMain" : {"#" : "clicker-main"},
-						"myLabel" : {"#" : "myLabel"},
-						"dragDrop" : {"@" : "DragDrop"}
+						"myLabel" : {"#" : "myLabel"}
                     }
                 },
 	            "dtext1" : {
-- 
cgit v1.2.3


From 307d339e45b209dab80ff88196a9f85f8d58f425 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 8 May 2012 11:48:29 -0700
Subject: Timeline: Update drag and drop handlers to be unique for drag and
 drop type.

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

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

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 34c300df..c213cb70 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -868,6 +868,9 @@ var Layer = exports.Layer = Montage.create(Component, {
 	},
 	handleDragleave: {
 		value: function(event) {
+			if (this.parentComponent.parentComponent.draggingType !== "layer") {
+				return;
+			}
 			this.element.classList.remove("dragOver");
 		}
 	},
@@ -875,10 +878,14 @@ var Layer = exports.Layer = Montage.create(Component, {
 		value: function(event) {
 			this.parentComponent.parentComponent.dragLayerID = this.layerID;
             event.dataTransfer.setData('Text', 'Layer');
+            this.parentComponent.parentComponent.draggingType = "layer";
 		}
 	},
 	handleDragover: {
 		value: function(event) {
+			if (this.parentComponent.parentComponent.draggingType !== "layer") {
+				return;
+			}
 			event.preventDefault();
 			this.element.classList.add("dragOver");
 			event.dataTransfer.dropEffect = "move";
@@ -888,6 +895,9 @@ var Layer = exports.Layer = Montage.create(Component, {
 	
 	handleDrop : {
 		value: function(event) {
+			if (this.parentComponent.parentComponent.draggingType !== "layer") {
+				return;
+			}
 			event.stopPropagation();
 			this.element.classList.remove("dragOver");
 			if (this.parentComponent.parentComponent.dragLayerID !== this.layerID) {
-- 
cgit v1.2.3