From 8c32493a01ba6a2055704376c98bff3efe0557a3 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Mon, 8 Jan 2024 12:27:40 +0100 Subject: [PATCH 1/3] calendar datepicker on mobile now easily toggled #1084 --- www/calendar/inner.js | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/www/calendar/inner.js b/www/calendar/inner.js index f19879091..ab3a22033 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -1307,23 +1307,21 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v updateDateRange(); updateRecurring(); }); + var f = Flatpickr(goDate, { + enableTime: false, + defaultDate: APP.calendar.getDate()._date, + clickOpens: false, + //dateFormat: dateFormat, + onChange: function (date) { + date[0].setHours(12); + f.destroy(); + APP.moveToDate(+date[0]); + updateDateRange(); + updateRecurring(); + }, + }); $(goDate).click(function () { - var f = Flatpickr(goDate, { - enableTime: false, - defaultDate: APP.calendar.getDate()._date, - //dateFormat: dateFormat, - onChange: function (date) { - date[0].setHours(12); - f.destroy(); - APP.moveToDate(+date[0]); - updateDateRange(); - updateRecurring(); - }, - onClose: function () { - setTimeout(f.destroy); - } - }); - f.open(); + f.isOpen ? f.close() : f.open() }); APP.toolbar.$bottomL.append(h('div.cp-calendar-browse', [ goLeft, goToday, goRight, goDate From 95497ebe02de6513808504746bc3e5d669feee66 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Mon, 8 Jan 2024 12:36:08 +0100 Subject: [PATCH 2/3] lint compliance --- www/calendar/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/calendar/inner.js b/www/calendar/inner.js index ab3a22033..22a33e8f9 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -1321,7 +1321,7 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v }, }); $(goDate).click(function () { - f.isOpen ? f.close() : f.open() + return f.isOpen ? f.close() : f.open(); }); APP.toolbar.$bottomL.append(h('div.cp-calendar-browse', [ goLeft, goToday, goRight, goDate From 3efb3f677309e797c7c868d72d31338b9771de65 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Wed, 24 Jan 2024 14:53:57 +0000 Subject: [PATCH 3/3] fixes datepicker not opening after date is selected --- www/calendar/inner.js | 1 - 1 file changed, 1 deletion(-) diff --git a/www/calendar/inner.js b/www/calendar/inner.js index 22a33e8f9..f4d22a296 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -1314,7 +1314,6 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v //dateFormat: dateFormat, onChange: function (date) { date[0].setHours(12); - f.destroy(); APP.moveToDate(+date[0]); updateDateRange(); updateRecurring();