From 2229578c4af0997f2201bc24885ac3c70b5a8b37 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Mon, 2 Jun 2025 23:22:11 +0200 Subject: [PATCH] remove _renewed_message and just show dialog --- .../pretixpresale/event/fragment_cart.html | 3 +-- src/pretix/static/pretixpresale/js/ui/cart.js | 25 ++++++++----------- 2 files changed, 11 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 2fb59e598b..512ade0acf 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html @@ -511,10 +511,9 @@
- {% icon "check" %} diff --git a/src/pretix/static/pretixpresale/js/ui/cart.js b/src/pretix/static/pretixpresale/js/ui/cart.js index eada14df80..9836824372 100644 --- a/src/pretix/static/pretixpresale/js/ui/cart.js +++ b/src/pretix/static/pretixpresale/js/ui/cart.js @@ -5,7 +5,6 @@ var cart = { _deadline_call: 0, _time_offset: 0, _prev_diff_minutes: 0, - _renewed_message: "", _get_now: function () { return moment().add(cart._time_offset, 'ms'); @@ -66,11 +65,6 @@ var cart = { ).replace(/\{num\}/g, diff_minutes) ); } - $("#cart-extend-feedback").text(cart._renewed_message); - var dialog = $("#cart-extend-feedback-dialog").get(0); - if (cart._renewed_message) { - dialog.show(); - } cart._prev_diff_minutes = diff_minutes; } @@ -106,15 +100,9 @@ var cart = { $("#cart-deadline").attr("data-expires"), $("#cart-deadline").attr("data-max-expiry-extend") ); - $("#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() { - this.closest("dialog").close(); - }); }, - set_deadline: function (expiry, max_extend, renewed_message) { + set_deadline: function (expiry, max_extend) { "use strict"; cart._expiry_notified = false; cart._deadline = moment(expiry); @@ -123,7 +111,6 @@ var cart = { } cart._deadline_timeout = null; cart._max_extend = moment(max_extend); - cart._renewed_message = renewed_message || ""; cart.draw_deadline(); } }; @@ -135,9 +122,17 @@ $(function () { cart.init(); } + $("#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() { + this.closest("dialog").close(); + }); + $("#cart-extend-form").on("pretix:async-task-success", function(e, data) { if (data.success) { - cart.set_deadline(data.expiry, data.max_expiry_extend, data.message); + cart.set_deadline(data.expiry, data.max_expiry_extend); + $("#cart-extend-feedback-dialog").get(0).show(); } else { alert(data.message); }