Merge pull request #1260 from plone/pat-modal-cancelbutton

Fix close selector for default cancel buttons
plone · Dec 9, 2022 · b779409 · b779409
2 parents 82a9e68 + 4905251
commit b779409
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/pat/modal/modal.js b/src/pat/modal/modal.js
@@ -472,16 +472,18 @@ export default Base.extend({
             self.emit("before-events-setup");
 
             // Wire up events
-            $(
-                ".modal-header > .modal-close, .modal-footer > .pattern-modal-buttons > .modal-close",
-                self.$modal
-            )
-                .off("click")
-                .on("click", function (e) {
+            self.$modal[0].querySelectorAll(
+                `.modal-header > .modal-close,
+                 .modal-footer > .pattern-modal-buttons > .modal-close,
+                 .modal-footer [name="form.buttons.Cancel" i]`
+            ).forEach((el) => {
+                $(el).off("click").on("click", (e) => {
                     e.stopPropagation();
                     e.preventDefault();
                     $(e.target).trigger("destroy.plone-modal.patterns");
                 });
+            });
+
 
             // form
             if (options.form) {