From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Wed, 10 Mar 2010 17:32:18 +0000 (-0500)
Subject: Fix incorrect conlfict resolution
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=cfd7bed91436a06d9883599e7fb4380c66c9f0f1;p=horde.git

Fix incorrect conlfict resolution
---

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index f85025539..93974de2a 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -2210,8 +2210,6 @@ KronolithCore = {
         if (newCalendar) {
             switch (type) {
             case 'internal':
-                $('kronolithCalendarinternalTags').autocompleter.init();
-                // Fall through
             case 'tasklists':
                 $('kronolithCalendar' + type + 'LinkImportExport').up('span').hide();
                 break;
@@ -2225,9 +2223,6 @@ KronolithCore = {
             $('kronolithCalendar' + type + 'Id').clear();
             $('kronolithCalendar' + type + 'Color').setValue('#dddddd').setStyle({ backgroundColor: '#dddddd', color: '#000' });
             form.down('.kronolithCalendarDelete').hide();
-            if (calendar && type == 'remote') {
-                $('kronolithCalendarremoteUrl').setValue(calendar);
-            }
             kronolithCTagAc.reset();
         } else {
             info = Kronolith.conf.calendars[type][calendar];