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

Calendar - Fix summer time change east of GMT caused 'today' to be off by one day in planner view

Browse Source
This commit is contained in:
nathangray 2017-03-27 08:49:05 -06:00
parent 8cfb2c997f
commit 36cb2fd39d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/et2_widget_planner.js
View File

@ -1134,8 +1134,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
if(!this.options.show_weekend && [0,6].indexOf(t.getDay()) !== -1 ) continue; if(!this.options.show_weekend && [0,6].indexOf(t.getDay()) !== -1 ) continue;
var holidays = []; var holidays = [];
var tempDate = new Date(t); var tempDate = new Date(t);
tempDate.setMinutes(tempDate.getMinutes()-start.getTimezoneOffset()); tempDate.setMinutes(tempDate.getMinutes()-tempDate.getTimezoneOffset());
var day_class = this.day_class_holiday(tempDate,holidays);
var title = ''; var title = '';
var state = ''; var state = '';
@ -1151,10 +1150,11 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
{ {
title = this.egw().lang(date('D',t)).substr(0,2)+'<br />'+date('j',t); title = this.egw().lang(date('D',t)).substr(0,2)+'<br />'+date('j',t);
} }
state = new Date(t.valueOf() - start.getTimezoneOffset() * 60 * 1000).toJSON(); state = new Date(t.valueOf() - t.getTimezoneOffset() * 60 * 1000);
var day_class = this.day_class_holiday(state,holidays);
content += '<div class="calendar_plannerDayScale et2_clickable et2_link '+ day_class+ content += '<div class="calendar_plannerDayScale et2_clickable et2_link '+ day_class+
'" data-date=\'' + state +'\''+ '" data-date=\'' + state.toJSON() +'\''+
(holidays ? ' title="'+holidays.join(',')+'"' : '')+'>'+title+"</div>\n"; (holidays ? ' title="'+holidays.join(',')+'"' : '')+'>'+title+"</div>\n";
} }
content += "</div>"; // end of plannerScale content += "</div>"; // end of plannerScale