From c555e6bc4221695b92a675ddff1fcb65acf50aa5 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 4 Aug 2012 17:12:19 +0200
Subject: [PATCH] Remove duplicated code

---
 plugins/calendar/calendar_ui.js | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 56725db9..1f9d4484 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -69,9 +69,10 @@ function rcube_calendar_ui(settings)
 
 
     /***  private methods  ***/
-    
+
     var Q = this.quote_html;
-    
+    var event_date_text = this.event_date_text;
+
     var text2html = function(str, maxlen, maxlines)
     {
       var html = Q(String(str));
@@ -246,22 +247,6 @@ function rcube_calendar_ui(settings)
       return is_attendee(event, 'ORGANIZER') || !event.id;
     };
 
-    // create a nice human-readable string for the date/time range
-    var event_date_text = function(event)
-    {
-      var fromto, duration = event.end.getTime() / 1000 - event.start.getTime() / 1000;
-      if (event.allDay)
-        fromto = $.fullCalendar.formatDate(event.start, settings['date_format']) + (duration > 86400 || event.start.getDay() != event.end.getDay() ? ' &mdash; ' + $.fullCalendar.formatDate(event.end, settings['date_format']) : '');
-      else if (duration < 86400 && event.start.getDay() == event.end.getDay())
-        fromto = $.fullCalendar.formatDate(event.start, settings['date_format']) + ' ' + $.fullCalendar.formatDate(event.start, settings['time_format']) +  ' &mdash; '
-          + $.fullCalendar.formatDate(event.end, settings['time_format']);
-      else
-        fromto = $.fullCalendar.formatDate(event.start, settings['date_format']) + ' ' + $.fullCalendar.formatDate(event.start, settings['time_format']) +  ' &mdash; '
-          + $.fullCalendar.formatDate(event.end, settings['date_format']) + ' ' + $.fullCalendar.formatDate(event.end, settings['time_format']);
-
-      return fromto;
-    };
-
     var load_attachment = function(event, att)
     {
       var qstring = '_id='+urlencode(att.id)+'&_event='+urlencode(event.recurrence_id||event.id)+'&_cal='+urlencode(event.calendar);