extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - avoid events ending at midnight (00:00) causing a 0 length event the next morning

Browse Source
This commit is contained in:
nathangray 2017-06-01 09:29:43 -06:00
parent e8b4e7087d
commit 3bc6999058
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/app.js
View File

@ -3029,7 +3029,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
start: typeof record.data.start === 'string' ? record.data.start : record.data.start.toJSON(),
end: typeof record.data.end === 'string' ? record.data.end : record.data.end.toJSON()
};
if(dates.start.substr(0,10) !== dates.end.substr(0,10))
if(dates.start.substr(0,10) !== dates.end.substr(0,10) &&
// Avoid events ending at midnight having a 0 length event the next day
dates.end.substr(11,8) !== '00:00:00')
{
var end = new Date(Math.min(new Date(record.data.end), new Date(state.last)));
end.setUTCHours(23);