From ce967e608de7aec7c7453d3bfa549dc78cdcf946 Mon Sep 17 00:00:00 2001 From: Hurmaan Ahmed Date: Wed, 6 Dec 2023 21:50:06 +0530 Subject: [PATCH 1/2] Issue #498 - Update MovieManagerUI.js Datepicker for advanced movie options blocks out dates that it shouldn't. 'maxDate' option defaults to null. reference: https://flatpickr.js.org/options/ The option has been removed from flatpickr instance. This allows user to select future dates. --- resources/js/Media/MovieManagerUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/Media/MovieManagerUI.js b/resources/js/Media/MovieManagerUI.js index 3cd381a89..29e4adfe0 100644 --- a/resources/js/Media/MovieManagerUI.js +++ b/resources/js/Media/MovieManagerUI.js @@ -425,7 +425,7 @@ var MovieManagerUI = MediaManagerUI.extend( dateFormat: 'Y/m/d', onOpen: function (selected, str, instance) { var observationDate = new Date(Helioviewer.userSettings.get("state.date")); - instance.set('maxDate', observationDate.toUTCDateString()); + instance.set(observationDate.toUTCDateString()); } }); $('#movie-end-date').flatpickr({ @@ -1157,4 +1157,4 @@ var MovieManagerUI = MediaManagerUI.extend( } }); -export { MovieManagerUI } \ No newline at end of file +export { MovieManagerUI } From 28dafac2c1281f6d491afa00d758812f5a0124df Mon Sep 17 00:00:00 2001 From: Hurmaan Ahmed Date: Wed, 6 Dec 2023 23:21:22 +0530 Subject: [PATCH 2/2] #498 - Update MovieManagerUI.js #512 PR review suggested further changes. doOpen handler is entirely removed --- resources/js/Media/MovieManagerUI.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/resources/js/Media/MovieManagerUI.js b/resources/js/Media/MovieManagerUI.js index 29e4adfe0..c31545d1e 100644 --- a/resources/js/Media/MovieManagerUI.js +++ b/resources/js/Media/MovieManagerUI.js @@ -422,19 +422,11 @@ var MovieManagerUI = MediaManagerUI.extend( //Movie Generation time pickers $('#movie-start-date').flatpickr({ allowInput: true, - dateFormat: 'Y/m/d', - onOpen: function (selected, str, instance) { - var observationDate = new Date(Helioviewer.userSettings.get("state.date")); - instance.set(observationDate.toUTCDateString()); - } + dateFormat: 'Y/m/d' }); $('#movie-end-date').flatpickr({ allowInput: true, - dateFormat: 'Y/m/d', - onOpen: function (selected, str, instance) { - var observationDate = new Date(Helioviewer.userSettings.get("state.date")); - instance.set('minDate', observationDate.toUTCDateString()); - } + dateFormat: 'Y/m/d' }); if ($('#movie-start-date').length > 0) { $('#movie-start-date')[0]._flatpickr.setDate(new Date(Helioviewer.userSettings.get("state.date") - duration).toUTCDateString());