From c1e9614389b7ed2e494697981cd1078954f2733e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Rez=C3=A9?= Date: Fri, 20 Oct 2023 20:53:40 +0200 Subject: [PATCH 1/3] FIX calendar picker if weeknumbers hidden and time format 24h --- .../system/js/fields/calendar.es5.js | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/build/media_source/system/js/fields/calendar.es5.js b/build/media_source/system/js/fields/calendar.es5.js index b4bc2721020b4..5538c7a0025a4 100644 --- a/build/media_source/system/js/fields/calendar.es5.js +++ b/build/media_source/system/js/fields/calendar.es5.js @@ -779,17 +779,28 @@ cell.colSpan = 1; } - H.addEventListener("change", function (event) { - self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value, - event.target.parentNode.parentNode.childNodes[2].childNodes[0].value, - event.target.parentNode.parentNode.childNodes[3].childNodes[0].value); - }, false); - M.addEventListener("change", function (event) { - self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value, - event.target.parentNode.parentNode.childNodes[2].childNodes[0].value, - event.target.parentNode.parentNode.childNodes[3].childNodes[0].value); - }, false); - })(); + if (self.params.weekNumbers) { + H.addEventListener("change", function (event) { + self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value, + event.target.parentNode.parentNode.childNodes[2].childNodes[0].value, + event.target.parentNode.parentNode.childNodes[3].childNodes[0].value); + }, false); + M.addEventListener("change", function (event) { + self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value, + event.target.parentNode.parentNode.childNodes[2].childNodes[0].value, + event.target.parentNode.parentNode.childNodes[3].childNodes[0].value); + }, false); + } else { + H.addEventListener("change", function (event) { + self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value, + event.target.parentNode.parentNode.childNodes[2].childNodes[0].value); + }, false); + M.addEventListener("change", function (event) { + self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value, + event.target.parentNode.parentNode.childNodes[2].childNodes[0].value); + }, false); + } + })(); } row = createElement("div", this.wrapper); From 6f6e79779db9d7f2b335836a088199e5d6c7929b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Rez=C3=A9?= Date: Fri, 20 Oct 2023 20:58:03 +0200 Subject: [PATCH 2/3] FIX calendar picker if weeknumbers hidden and time format 24h --- build/media_source/system/js/fields/calendar.es5.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/system/js/fields/calendar.es5.js b/build/media_source/system/js/fields/calendar.es5.js index 5538c7a0025a4..ea6a7ab7e1a78 100644 --- a/build/media_source/system/js/fields/calendar.es5.js +++ b/build/media_source/system/js/fields/calendar.es5.js @@ -800,7 +800,7 @@ event.target.parentNode.parentNode.childNodes[2].childNodes[0].value); }, false); } - })(); + })(); } row = createElement("div", this.wrapper); From b867b62265f2d0ce98f40519ce2bc8ba5af2d1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20Rez=C3=A9?= Date: Fri, 20 Oct 2023 20:59:33 +0200 Subject: [PATCH 3/3] FIX calendar picker if weeknumbers hidden and time format 24h