beenull/calendar
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Synchronize bug fixes from git.kolab.org

Browse source
This commit is contained in:
Thomas Bruederli 2014-11-09 16:59:00 +01:00
parent f1e13aa0e4
commit 09a478653a
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
calendar_ui.js
View file

@ -1630,6 +1630,17 @@ function rcube_calendar_ui(settings)
event.temp = true;
event.className = 'fc-event-cal-'+data.calendar+' fc-event-temp';
fc.fullCalendar(data.id ? 'updateEvent' : 'renderEvent', event);
// mark all recurring instances as temp
if (event.recurrence || event.recurrence_id) {
var base_id = event.recurrence_id ? event.recurrence_id.replace(/-\d+$/, '') : event.id;
$.each(fc.fullCalendar('clientEvents', function(e){ return e.id == base_id || e.recurrence_id == base_id; }), function(i,ev) {
ev.temp = true;
ev.editable = false;
event.className += ' fc-event-temp';
fc.fullCalendar('updateEvent', ev);
});
}
}
};
@ -2768,6 +2779,8 @@ function rcube_calendar_ui(settings)
$('#edit-attendees-form .attendees-invitebox').show();
}
}
// reset autocompletion on tab change (#3389)
rcmail.ksearch_blur();
}
});
$('#edit-enddate').datepicker(datepicker_settings);

4
lib/js/fullcalendar.js
View file

@ -1431,9 +1431,9 @@ function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false
if (!m) {
return null;
}
var date = new Date(m[1], 0, 1);
var date = new Date(m[1], 0, 2);
if (ignoreTimezone || !m[13]) {
var check = new Date(m[1], 0, 1, 9, 0);
var check = new Date(m[1], 0, 2, 9, 0);
if (m[3]) {
date.setMonth(m[3] - 1);
check.setMonth(m[3] - 1);