plugins/calendar

[Thomas Brüderli]

 plugins/calendar/calendar.php   |    5 ++++-
 plugins/calendar/calendar_ui.js |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8cff86aef2c762a5e1353be63874d051008960f6
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Thu Aug 2 17:42:56 2012 +0200

    Fix removing temp/deleted events from UI (#912); consider undo_timeout setting in UI

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index d1aea13..02c2ae9 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -209,7 +209,10 @@ class calendar extends rcube_plugin
       default:
         $this->driver = new $driver_class($this);
         break;
-      }
+     }
+
+     if ($this->driver->undelete)
+        $this->driver->undelete = $this->rc->config->get('undo_timeout', 0) > 0;
   }
 
   /**
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 644ef45..2c27590 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1554,7 +1554,7 @@ function rcube_calendar_ui(settings)
       
       // render event temporarily into the calendar
       if ((data.start && data.end) || data.id) {
-        var event = data.id ? $.extend(fc.fullCalendar('clientEvents', data.id)[0], data) : data;
+        var event = data.id ? $.extend(fc.fullCalendar('clientEvents', function(e){ return e.id == data.id; })[0], data) : data;
         if (data.start)
           event.start = fromunixtime(data.start);
         if (data.end)