From 09a478653aeac24d7a30ef08fc721e575004ac3f Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 9 Nov 2014 16:59:00 +0100 Subject: [PATCH] Synchronize bug fixes from git.kolab.org --- calendar_ui.js | 13 +++++++++++++ lib/js/fullcalendar.js | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/calendar_ui.js b/calendar_ui.js index c965d15..855bacb 100644 --- a/calendar_ui.js +++ b/calendar_ui.js @@ -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); diff --git a/lib/js/fullcalendar.js b/lib/js/fullcalendar.js index 4f0862a..72241da 100644 --- a/lib/js/fullcalendar.js +++ b/lib/js/fullcalendar.js @@ -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);