Calendar: Clicking #datecontrol_date gives datepicker to jump to date

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 0d44722abb81f002ad4a8d74249dbc0786ad114b..1cbe5c6764673a59335081af35e5f3c03cb426ee 100644 (file)
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -845,7 +845,7 @@ $(document).ready(function(){
                dayNamesShort: dayNamesShort,
                allDayText: allDayText,
                viewDisplay: function(view) {
-                       $('#datecontrol_date').val(view.title);
+                       $('#datecontrol_date').val($('<p>').html(view.title).text());
                        if (view.name != defaultView) {
                                $.post(OC.filePath('calendar', 'ajax', 'changeview.php'), {v:view.name});
                                defaultView = view.name;
@@ -884,6 +884,22 @@ $(document).ready(function(){
                loading: Calendar.UI.loading,
                eventSources: eventSources
        });
+       $('#datecontrol_date').datepicker({
+               changeMonth: true,
+               changeYear: true,
+               showButtonPanel: true,
+               beforeShow: function(input, inst) {
+                       var calendar_holder = $('#calendar_holder');
+                       var date = calendar_holder.fullCalendar('getDate');
+                       inst.input.datepicker('setDate', date);
+                       inst.input.val(calendar_holder.fullCalendar('getView').title);
+                       return inst;
+               },
+               onSelect: function(value, inst) {
+                       var date = inst.input.datepicker('getDate');
+                       $('#calendar_holder').fullCalendar('gotoDate', date);
+               }
+       });
        fillWindow($('#content'));
        OCCategories.changed = Calendar.UI.categoriesChanged;
        OCCategories.app = 'calendar';