From 24b3c184c5ac740de4411b61c6986a234aa425ae Mon Sep 17 00:00:00 2001
From: Richard Schreiber <schreiber@rami.io>
Date: Mon, 2 Jun 2025 22:10:09 +0200
Subject: [PATCH] Make button read the confirmation message

---
 .../pretixpresale/event/fragment_cart.html      | 10 ++++++----
 src/pretix/static/pretixpresale/js/ui/cart.js   | 17 ++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index 47c0ea6f92..2c7ae60dbb 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -513,10 +513,12 @@
         </form>
         <dialog role="alertdialog" id="cart-extend-feedback-dialog" aria-labelledby="cart-extend-feedback">
             <form method="dialog">
-                <span id="cart-extend-feedback" class="text-muted"></span>
-                <button class="btn btn-default" autofocus value="OK">
-                    {% icon "check" %} {% trans "OK" %}
-                </button>
+                <p>
+                    <span id="cart-extend-feedback" class="text-muted sr-only"></span>
+                    <button class="btn btn-default" autofocus value="OK">
+                        {% icon "check" %} {% trans "Reservation renewed" %}
+                    </button>
+                </p>
             </form>
         </dialog>
     {% else %}
diff --git a/src/pretix/static/pretixpresale/js/ui/cart.js b/src/pretix/static/pretixpresale/js/ui/cart.js
index bd7cca6ed1..eada14df80 100644
--- a/src/pretix/static/pretixpresale/js/ui/cart.js
+++ b/src/pretix/static/pretixpresale/js/ui/cart.js
@@ -106,20 +106,11 @@ var cart = {
             $("#cart-deadline").attr("data-expires"),
             $("#cart-deadline").attr("data-max-expiry-extend")
         );
-        $("#cart-extend-feedback-dialog").on("close", function () {
-            if (this.returnValue) { // OK-Button has been pressed, nothing else has received focus
-                var cart_panel_heading = $(this).closest(".panel").find(".panel-heading").get(0);
-                if (cart_panel_heading) {
-                    window.setTimeout(function () {
-                        cart_panel_heading.focus();
-                    }, 50);
-                }
-            }
+        $("#cart-extend-feedback-dialog").on("keydown", function (e) {
+            // prevent enter or space-bar from bubbling up and closing the cart-panel
+            e.stopPropagation();
         }).find("button").on("blur", function() {
-            var dialog = this.closest("dialog");
-            if (dialog.open) {
-                dialog.close();
-            }
+            this.closest("dialog").close();
         });
     },