diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-06-13 09:05:35 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-06-13 21:39:12 +0200 |
| commit | 7a8e7f18dbb473552c1427c24402104d9bc181a4 (patch) | |
| tree | 508e33c3ed37d09e457db3ec627fd40ffe8a005b /apps/calendar | |
| parent | 4da6b3a3916ce4d986275a1f7f90e7fb0984b822 (diff) | |
| download | nextcloud-server-7a8e7f18dbb473552c1427c24402104d9bc181a4.tar.gz nextcloud-server-7a8e7f18dbb473552c1427c24402104d9bc181a4.zip | |
Calendar: Clicking #datecontrol_date gives datepicker to jump to date
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/js/calendar.js | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 0d44722abb8..1cbe5c67646 100644 --- 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'; |