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/TimelineTrack.reel/TimelineTrack.js | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 76d52036..03e3b01e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -890,10 +890,14 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     		this._appendHelper = true;
     		this._deleteHelper = false;
     		this.parentComponent.parentComponent.draggingTrackId = this.trackID;
+    		this.parentComponent.parentComponent.draggingType = "keyframe";
     	}
     },
     handleKeyframeDragend : {
     	value: function(event) {
+    		if (this.parentComponent.parentComponent.draggingType !== "keyframe") {
+    			return;
+    		}
     		this._deleteHelper = true;
     		this.needsDraw = true;
            
-- 
cgit v1.2.3