From 2d0018be3e2dd9542fe8f0fd2ef30992322d7154 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@brotherli.ch>
Date: Fri, 16 Sep 2011 16:10:11 +0200
Subject: [PATCH] Fix select focus / option selection bug #409

---
 plugins/calendar/calendar_ui.js      | 1 +
 plugins/calendar/lib/calendar_ui.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 92270cbc..e84b3bdc 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2421,6 +2421,7 @@ function rcube_calendar_ui(settings)
           $('#recurrence-form-'+freq+', #recurrence-form-until').show();
       });
       $('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
+      $('#edit-recurrence-repeat-times').change(function(e){ $('#edit-recurrence-repeat-count').prop('checked', true); });
 
       // init attendees autocompletion
       var ac_props;
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 64ddc094..abec75f7 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -459,11 +459,11 @@ class calendar_ui
           $this->cal->gettext('forever')));
 
         $table->add('label', '');
-        $table->add(null, html::label(null, $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count')) . ' ' .
+        $table->add(null, $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count')) . ' ' .
           $this->cal->gettext(array(
             'name' => 'forntimes',
             'vars' => array('nr' => $select->show(1)))
-          )));
+          ));
 
         $table->add('label', '');
         $table->add(null, $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until')) . ' ' .