Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix calendar week selector when crossing year boundary (#3915)

Browse source
This commit is contained in:
Thomas Bruederli 2014-12-28 14:27:10 +01:00
parent ff87ed69f8
commit 39a12a43e2
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/calendar/calendar_ui.js
View file

@ -3882,12 +3882,16 @@ function rcube_calendar_ui(settings)
base_date.setYear(minical.data('year')); base_date.setYear(minical.data('year'));
base_date.setHours(12); base_date.setHours(12);
base_date.setDate(base_date.getDate() - ((base_date.getDay() + 6) % 7) + datepicker_settings.firstDay); base_date.setDate(base_date.getDate() - ((base_date.getDay() + 6) % 7) + datepicker_settings.firstDay);
var day_off = base_date.getDay() - datepicker_settings.firstDay; var base_kw = iso8601Week(base_date),
var base_kw = iso8601Week(base_date); target_kw = parseInt(cell.html()),
var target_kw = parseInt(cell.html()); wdiff = target_kw - base_kw;
var diff = (target_kw - base_kw) * 7 * DAY_MS; if (wdiff > 10) // year jump
base_date.setYear(base_date.getFullYear() - 1);
else if (wdiff < -10)
base_date.setYear(base_date.getFullYear() + 1);
// select monday of the chosen calendar week // select monday of the chosen calendar week
var date = new Date(base_date.getTime() - day_off * DAY_MS + diff); var day_off = base_date.getDay() - datepicker_settings.firstDay,
date = new Date(base_date.getTime() - day_off * DAY_MS + wdiff * 7 * DAY_MS);
fc.fullCalendar('gotoDate', date).fullCalendar('setDate', date).fullCalendar('changeView', 'agendaWeek'); fc.fullCalendar('gotoDate', date).fullCalendar('setDate', date).fullCalendar('changeView', 'agendaWeek');
minical.datepicker('setDate', date); minical.datepicker('setDate', date);
} }