extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not scroll time grid when you're dragging over the header.

Browse Source
This commit is contained in:
Nathan Gray 2015-12-08 19:27:25 +00:00
parent f6cc24cb15
commit dfa30deb56
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/js/et2_widget_timegrid.js
View File

@ -324,13 +324,20 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
// Make sure the target is visible in the scrollable day // Make sure the target is visible in the scrollable day
var scrollto = element.dropEnd.next() ? element.dropEnd.next() : element.dropEnd; var scrollto = element.dropEnd.next() ? element.dropEnd.next() : element.dropEnd;
if(scrollto.length && this.scrolling.height() + this.scrolling.scrollTop() < scrollto.position().top+scrollto.height() ) if(this.scrolling.find(element.dropEnd).length == element.dropEnd.length)
{ {
scrollto.get(0).scrollIntoView(false); if(scrollto.length && this.scrolling.height() + this.scrolling.scrollTop() < scrollto.position().top+scrollto.height() )
} {
else if(element.dropEnd.position().top < this.scrolling[0].scrollTop) scrollto.get(0).scrollIntoView(false);
{ }
this.scrolling.scrollTop(element.dropEnd.position().top); else if(element.dropEnd.position().top < this.scrolling[0].scrollTop)
{
this.scrolling.scrollTop(element.dropEnd.position().top);
}
else if (element.dropEnd.prev() && element.dropEnd.prev().position().top < this.scrolling[0].scrollTop)
{
this.scrolling.scrollTop(element.dropEnd.prev().position().top);
}
} }
var time = ''; var time = '';
if(this._drop_data.whole_day) if(this._drop_data.whole_day)