holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect tooltip in planner if event did not start or end on the hour

Browse Source
This commit is contained in:
nathangray 2016-09-08 08:50:26 -06:00
parent 4d2fce1d06
commit fe838d2ad3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/et2_widget_daycol.js
View File

@ -885,13 +885,13 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
{ {
event.end = new Date(event.end); event.end = new Date(event.end);
} }
event['start_m'] = parseInt((event.start.valueOf()/1000 - day_start) / 60); event['start_m'] = event.start.getUTCHours() * 60 + event.start.getUTCMinutes();
if (event['start_m'] < 0) if (event['start_m'] < 0)
{ {
event['start_m'] = 0; event['start_m'] = 0;
event['multiday'] = true; event['multiday'] = true;
} }
event['end_m'] = parseInt((event.end.valueOf()/1000 - day_start) / 60); event['end_m'] = event.end.getUTCHours() * 60 + event.end.getUTCMinutes();
if (event['end_m'] >= 24*60) if (event['end_m'] >= 24*60)
{ {
event['end_m'] = 24*60-1; event['end_m'] = 24*60-1;

4
calendar/js/et2_widget_planner_row.js
View File

@ -576,13 +576,13 @@ var et2_calendar_planner_row = (function(){ "use strict"; return et2_valueWidget
day_start -= daylight_diff; day_start -= daylight_diff;
} }
event['start_m'] = parseInt((event.start.valueOf()/1000 - day_start) / 60); event['start_m'] = event.start.getUTCHours() * 60 + event.start.getUTCMinutes();
if (event['start_m'] < 0) if (event['start_m'] < 0)
{ {
event['start_m'] = 0; event['start_m'] = 0;
event['multiday'] = true; event['multiday'] = true;
} }
event['end_m'] = parseInt((event.end.valueOf()/1000 - day_start) / 60); event['end_m'] = event.end.getUTCHours() * 60 + event.end.getUTCMinutes();
if (event['end_m'] >= 24*60) if (event['end_m'] >= 24*60)
{ {
event['end_m'] = 24*60-1; event['end_m'] = 24*60-1;