Merge branch 'refs/heads/TimelineUber' into TimelineProps

2 files changed, 11 insertions, 3 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index ba7c18c3..c7e7b575 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -17,13 +17,11 @@
                                                 "styleRepetition" : {"@":"repetition1"},
                                                 "dynamicLayerName" : {"@":"dtext1"},
                                                 "dynamicLayerTag" : {"@": "dtext2"},
-                                                "slotStyle" : {"@":"slot1"},
                                                 "mainCollapser" : {"@" : "mainCollapser"},
                                                 "positionCollapser" : {"@" : "positionCollapser"},
                                                 "styleCollapser" : {"@" : "styleCollapser"},
                                                 "clickerMain" : {"#" : "clicker-main"},
-                                                "myLabel" : {"#" : "myLabel"},
-                                                "dragDrop" : {"@" : "DragDrop"}
+                                                "myLabel" : {"#" : "myLabel"}
                     }
                 },
                     "dtext1" : {
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 245aabd4..130dd044 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -777,6 +777,9 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         handleDragleave: {
                 value: function(event) {
+                        if (this.parentComponent.parentComponent.draggingType !== "layer") {
+                                return;
+                        }
                         this.element.classList.remove("dragOver");
                 }
         },
@@ -784,10 +787,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";
@@ -797,6 +804,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) {