From 35eab31c7e06dfd11ce0bbaf35e4c463565410d6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 3 Nov 2015 21:53:04 +0000
Subject: [PATCH] Only process first drop event if an event is dropped onto
 multiple conflicting events.  Fixes multiple schedule conflict popups.

---
 calendar/js/et2_widget_timegrid.js | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/calendar/js/et2_widget_timegrid.js b/calendar/js/et2_widget_timegrid.js
index 9345bc724e..adbf398a34 100644
--- a/calendar/js/et2_widget_timegrid.js
+++ b/calendar/js/et2_widget_timegrid.js
@@ -882,23 +882,11 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
 					if(!source[i].id) continue;
 					if(source[i].manager === target.manager)
 					{
-						// Check for hidden helper
-						var dropEnd = $j('.calendar_d-n-d_timeCounter',action.ui.helper);
-						if(dropEnd.length && dropEnd[0].dropEnd)
+						if (self._drop_data)
 						{
-							dropEnd = dropEnd[0].dropEnd[0].dataset || {};
+							self._event_drop.call(source[i].iface.getDOMNode(),self,null, action.ui,self._drop_data);
 						}
-						else if (self._drop_data)
-						{
-							dropEnd = self._drop_data;
-						}
-						else
-						{
-							self._drag_helper(source[i].iface.getDOMNode(),target.iface.getDOMNode(),$j(source[i].iface.getDOMNode()).height());
-							dropEnd = undefined;
-						}
-						
-						self._event_drop.call(source[i].iface.getDOMNode(),self,null, action.ui,dropEnd);
+						self._drop_data = false;
 						// Ok, stop.
 						return false;
 					}