From a8d9d29ba1062a114c34d99b04d4402305736663 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Fri, 27 Jun 2014 14:18:42 +0200
Subject: [PATCH] Directly assign event rendering callback

---
 plugins/calendar/calendar_ui.js | 48 +++++++++++++++------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 623fef71..d10e8990 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -143,7 +143,28 @@ function rcube_calendar_ui(settings)
       },
       currentTimeIndicator: settings.time_indicator,
       // event rendering
-      eventRender: fc_event_render,
+      eventRender: function(event, element, view) {
+        if (view.name != 'list' && view.name != 'table') {
+          var prefix = event.sensitivity && event.sensitivity != 'public' ? String(sensitivitylabels[event.sensitivity]).toUpperCase()+': ' : '';
+          element.attr('title', prefix + event.title);
+        }
+        if (view.name != 'month') {
+          if (event.location) {
+            element.find('div.fc-event-title').after('<div class="fc-event-location">@&nbsp;' + Q(event.location) + '</div>');
+          }
+          if (event.sensitivity && event.sensitivity != 'public')
+            element.find('div.fc-event-time').append('<i class="fc-icon-sensitive"></i>');
+          if (event.recurrence)
+            element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>');
+          if (event.alarms)
+            element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');
+        }
+        if (event.status) {
+          element.addClass('cal-event-status-' + String(event.status).toLowerCase());
+        }
+
+        element.attr('aria-label', event.title + ', ' + me.event_date_text(event, true));
+      },
       // render element indicating more (invisible) events
       overflowRender: function(data, element) {
         element.html(rcmail.gettext('andnmore', 'calendar').replace('$nr', data.count))
@@ -2094,31 +2115,6 @@ function rcube_calendar_ui(settings)
       $('#agenda-listsections').val(fc.fullCalendar('option', 'listSections'));
     }
 
-    /*** fullcalendar event handlers ***/
-
-    var fc_event_render = function(event, element, view) {
-      if (view.name != 'list' && view.name != 'table') {
-        var prefix = event.sensitivity && event.sensitivity != 'public' ? String(sensitivitylabels[event.sensitivity]).toUpperCase()+': ' : '';
-        element.attr('title', prefix + event.title);
-      }
-      if (view.name != 'month') {
-        if (event.location) {
-          element.find('div.fc-event-title').after('<div class="fc-event-location">@&nbsp;' + Q(event.location) + '</div>');
-        }
-        if (event.sensitivity && event.sensitivity != 'public')
-          element.find('div.fc-event-time').append('<i class="fc-icon-sensitive"></i>');
-        if (event.recurrence)
-          element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>');
-        if (event.alarms)
-          element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');
-      }
-      if (event.status) {
-        element.addClass('cal-event-status-' + String(event.status).toLowerCase());
-      }
-
-      element.attr('aria-label', event.title + ', ' + me.event_date_text(event, true));
-    };
-
 
     /*** public methods ***/