From: Jan Schneider <jan@horde.org>
Date: Wed, 8 Apr 2009 21:40:41 +0000 (+0200)
Subject: The same property is already set with a different name. Nuke it.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=2980dacff68e7568f3397fb7705641eb0ce17ec8;p=horde.git

The same property is already set with a different name. Nuke it.
---

diff --git a/kronolith/js/src/kronolith.js b/kronolith/js/src/kronolith.js
index 166066308..c3f7f139a 100644
--- a/kronolith/js/src/kronolith.js
+++ b/kronolith/js/src/kronolith.js
@@ -750,7 +750,7 @@ KronolithCore = {
                     calendar && calendar != event.value.calendar) {
                     return;
                 }
-                this._insertEvent(event, calendar, date, view);
+                this._insertEvent(event, date, view);
             }, this);
             day.next().day();
         }
@@ -760,20 +760,17 @@ KronolithCore = {
      * Creates the DOM node for an event bubble and inserts it into the view.
      *
      * @param object event     A Hash member with the event to insert.
-     * @param string calendar  The calendar to update.
      * @param string date      The day to update.
      * @param string view      The view to update.
      */
-    _insertEvent: function(event, calendar, date, view)
+    _insertEvent: function(event, date, view)
     {
-        calendar = event.value.cal || calendar;
-        event.value.cal = calendar;
-        event.value.nodeId = 'kronolithEvent' + calendar + date + event.key;
+        event.value.nodeId = 'kronolithEvent' + event.value.calendar + date + event.key;
 
-        _createElement = function(event, calendar) {
+        _createElement = function(event) {
             return new Element('DIV', {
                 'id': event.value.nodeId,
-                'calendar': calendar,
+                'calendar': event.value.calendar,
                 'eventid' : event.key,
                 'class': 'kronolithEvent'
             });
@@ -783,7 +780,7 @@ KronolithCore = {
         case 'day':
         case 'week':
             this._calculateRowSizes('daySizes', view == 'day' ? 'kronolithViewDay' : 'kronolithViewWeek');
-            var div = _createElement(event, calendar),
+            var div = _createElement(event),
                 style = { 'backgroundColor': event.value.bg,
                           'color': event.value.fg };
 
@@ -864,7 +861,7 @@ KronolithCore = {
             break;
 
         case 'month':
-            var div = _createElement(event, calendar)
+            var div = _createElement(event)
                 .setStyle({ 'backgroundColor': event.value.bg,
                             'color': event.value.fg });