Merge pull request #13004 from chahmedejaz/bugfix/12982-unable-to-close-confirmation-modals

[Orders Page] Fix Confirmation modals do not auto-close
This commit is contained in:
Filipe
2024-12-07 10:33:56 -06:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -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() {

View File

@@ -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");