CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Widget: fix broken iframe detection

Browse Source
This commit is contained in:
Raphael Michel
2018-03-20 12:27:56 +01:00
parent 2db1e6b596
commit 879eb6ee9f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/forms/checkout.py
View File

@@ -39,7 +39,7 @@ class ContactForm(forms.Form):
help_text=_('Please enter the same email address again to make sure you typed it correctly.') help_text=_('Please enter the same email address again to make sure you typed it correctly.')
) )
if self.request.session.get('iframe_session', False): if not self.request.session.get('iframe_session', False):
# There is a browser quirk in Chrome that leads to incorrect initial scrolling in iframes if there # There is a browser quirk in Chrome that leads to incorrect initial scrolling in iframes if there
# is an autofocus field. Who would have thought… See e.g. here: # is an autofocus field. Who would have thought… See e.g. here:
# https://floatboxjs.com/forum/topic.php?post=8440&usebb_sid=2e116486a9ec6b7070e045aea8cded5b#post8440 # https://floatboxjs.com/forum/topic.php?post=8440&usebb_sid=2e116486a9ec6b7070e045aea8cded5b#post8440

7
src/pretix/static/pretixpresale/js/widget/widget.js
View File

@@ -406,7 +406,12 @@ var shared_methods = {
if (data.redirect.substr(0, 1) === '/') { if (data.redirect.substr(0, 1) === '/') {
data.redirect = this.$root.event_url.replace(/^([^\/]+:\/\/[^\/]+)\/.*$/, "$1") + data.redirect; data.redirect = this.$root.event_url.replace(/^([^\/]+:\/\/[^\/]+)\/.*$/, "$1") + data.redirect;
} }
var url = data.redirect + '?iframe=1&locale=' + lang + '&take_cart_id=' + this.$root.cart_id; var url = data.redirect;
if (url.indexOf('?')) {
url = url + '&iframe=1&locale=' + lang + '&take_cart_id=' + this.$root.cart_id;
} else {
url = url + '?iframe=1&locale=' + lang + '&take_cart_id=' + this.$root.cart_id;
}
if (data.success === false) { if (data.success === false) {
url = url.replace(/checkout\/start/g, ""); url = url.replace(/checkout\/start/g, "");
this.$root.error_message = data.message; this.$root.error_message = data.message;