From c6ef285c06905c28fe8915f9c4f916e74f6c8287 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 30 Mar 2012 14:58:38 -0700
Subject: Timeline: Link layerDragEnd and layerDrop events to better handle end
 of drag-and-drop events.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index a82d3373..3eaf3dec 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1071,8 +1071,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     		// dragend doesn't fire. So if we're here in drop 
     		// and there's still a helper, we need to manually fire dragend.
     		if (this._dragAndDropHelper !== null) {
-            	this.container_layers.removeChild(this._dragAndDropHelper);
-				this._dragAndDropHelper = null;
+    			this.handleLayerDragEnd(event);
     		}
     	}
     },
-- 
cgit v1.2.3