Branch 'roundcubemail-plugins-kolab-0.7' - plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Tue Jul 17 14:09:14 CEST 2012
plugins/calendar/calendar.php | 1 +
plugins/calendar/calendar_ui.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4f70073f0aae109e6f0098a9b62905de857955ac
Author: Thomas Bruederli <thomas at roundcube.net>
Date: Tue Jul 17 14:08:57 2012 +0200
Better fix for #880
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index f079746..8c815dd 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1059,6 +1059,7 @@ class calendar extends rcube_plugin
$event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);
return array(
+ '_id' => $event['calendar'] . ':' . $event['id'], // unique identifier for fullcalendar
'start' => gmdate('c', $this->fromGMT($event['start'])), // client treats date strings as they were in users's timezone
'end' => gmdate('c', $this->fromGMT($event['end'])), // so shift timestamps to users's timezone and render a date string
'description' => strval($event['description']),
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 405f723..a8eb2b8 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1979,7 +1979,7 @@ function rcube_calendar_ui(settings)
var event = p.update;
event.temp = false;
event.editable = source.editable;
- var existing = fc.fullCalendar('clientEvents', function(e){ return (e.id == event.id && e.calendar == event.calendar); });
+ var existing = fc.fullCalendar('clientEvents', event._id);
if (existing.length) {
$.extend(existing[0], event);
fc.fullCalendar('updateEvent', existing[0]);
More information about the commits
mailing list