extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only process first drop event if an event is dropped onto multiple conflicting events. Fixes multiple schedule conflict popups.

Browse Source
This commit is contained in:
Nathan Gray 2015-11-03 21:53:04 +00:00
parent 3dc87c4574
commit 35eab31c7e
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/js/et2_widget_timegrid.js
View File

@ -882,23 +882,11 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
if(!source[i].id) continue; if(!source[i].id) continue;
if(source[i].manager === target.manager) if(source[i].manager === target.manager)
{ {
// Check for hidden helper if (self._drop_data)
var dropEnd = $j('.calendar_d-n-d_timeCounter',action.ui.helper);
if(dropEnd.length && dropEnd[0].dropEnd)
{ {
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) self._drop_data = false;
{
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);
// Ok, stop. // Ok, stop.
return false; return false;
} }