From 1dec3debe16f0bcc02e085a2555ad5c65b3f3b14 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Thu, 28 Nov 2024 03:12:11 +0500 Subject: [PATCH 1/2] 12982: update close guard condition - Execute the close method only when the current context modal is opened --- app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js b/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js index 7648563791..45c67dc38d 100644 --- a/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js +++ b/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js @@ -12,8 +12,8 @@ export const useOpenAndCloseAsAModal = (controller) => { }.bind(controller), close: function (_event, remove = false) { - // Only execute close if there is an open modal - if (!document.querySelector("body").classList.contains('modal-open')) return; + // Only execute close if the current modal is open + if (!this.modalTarget.classList.contains('in')) return; this.modalTarget.classList.remove("in"); this.backgroundTarget.classList.remove("in"); From 60ace5d3ffc89cd11fcc4830bc7eee60721eff31 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Thu, 28 Nov 2024 03:18:34 +0500 Subject: [PATCH 2/2] 12982: add hu locale config for flatpickr --- app/webpacker/controllers/flatpickr_controller.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/webpacker/controllers/flatpickr_controller.js b/app/webpacker/controllers/flatpickr_controller.js index 66a5d53a5d..b175770098 100644 --- a/app/webpacker/controllers/flatpickr_controller.js +++ b/app/webpacker/controllers/flatpickr_controller.js @@ -13,6 +13,7 @@ import { ru } from "flatpickr/dist/l10n/ru"; import { sv } from "flatpickr/dist/l10n/sv"; import { tr } from "flatpickr/dist/l10n/tr"; import { en } from "flatpickr/dist/l10n/default.js"; +import { hu } from "flatpickr/dist/l10n/hu"; import ShortcutButtonsPlugin from "shortcut-buttons-flatpickr"; import labelPlugin from "flatpickr/dist/plugins/labelPlugin/labelPlugin"; @@ -36,6 +37,7 @@ export default class extends Flatpickr { sv: sv, tr: tr, en: en, + hu: hu, }; initialize() {