Skip to content

Fixes Autoscroll on Sessions page #1444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariobehling merged 3 commits into from
Dec 8, 2025
Merged

Fixes Autoscroll on Sessions page #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aaf2dd
fix: prevent schedule page auto-scroll with updated widget
ArnavBallinCode Dec 5, 2025
16d0c9c
Merge branch 'enext' into fix-v2
ArnavBallinCode Dec 7, 2025
3ab5448
Merge branch 'enext' into fix-v2
ArnavBallinCode Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 58 additions & 66 deletions app/eventyay/agenda/templates/agenda/schedule.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,81 +5,73 @@
{% load static %}
{% load phrases %}

{% block container_width %} {% if not show_talk_list %}main-schedule{% else %}list-schedule{% endif %}{% endblock container_width %}
{% block container_width %}{% if not show_talk_list %}main-schedule{% else %}list-schedule{% endif %}{% endblock container_width %}

{% block agenda_custom_header %}
<script id="pretalx-messages" data-logged-in="{% if request.user.is_anonymous %}false{% else %}true{% endif %}" src="{{ request.event.urls.schedule }}widget/messages.js"></script>
<script id="pretalx-messages" data-logged-in="{% if request.user.is_anonymous %}false{% else %}true{% endif %}" src="{{ request.event.urls.schedule }}widget/messages.js"></script>
{% endblock agenda_custom_header %}

{% block header_right %}
<details class="dropdown mr-2" aria-haspopup="menu" role="menu">
<summary>
<span>{{ phrases.schedule.version }} {{ schedule.version|default:'-' }}</span>
<i class="fa fa-caret-down ml-1"></i>
</summary>
<div class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
<a class="dropdown-item" href="{{ request.event.urls.changelog }}" role="menuitem" tabindex="-1">
<i class="fa fa-book"></i>
{% translate "Changelog" %}
</a>
<hr>
{% for exporter in exporters %}
<a class="dropdown-item" href="{{ exporter.urls.base }}" role="menuitem" tabindex="-1" target="_blank">
{% if exporter.icon|slice:":3" == "fa-" %}
<span class="fa {{ exporter.icon }} export-icon"></span>
{% else %}
<span class="export-icon">{{ exporter.icon }}</span>
{% endif %}
{{ exporter.verbose_name }}
{% if exporter.show_qrcode %}
<span class="export-qrcode">
<i class="fa fa-qrcode"></i>
<div class="export-qrcode-image">{{ exporter.get_qrcode }}</div>
</span>
{% endif %}
</a>
{% endfor %}
</div>
</details>
<details class="dropdown mr-2" aria-haspopup="menu" role="menu">
<summary>
<span>{{ phrases.schedule.version }} {{ schedule.version|default:'-' }}</span>
<i class="fa fa-caret-down ml-1"></i>
</summary>
<div class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
<a class="dropdown-item" href="{{ request.event.urls.changelog }}" role="menuitem" tabindex="-1">
<i class="fa fa-book"></i>
{% translate "Changelog" %}
</a>
<hr>
{% for exporter in exporters %}
<a class="dropdown-item" href="{{ exporter.urls.base }}" role="menuitem" tabindex="-1" target="_blank">
{% if exporter.icon|slice:":3" == "fa-" %}
<span class="fa {{ exporter.icon }} export-icon"></span>
{% else %}
<span class="export-icon">{{ exporter.icon }}</span>
{% endif %}
{{ exporter.verbose_name }}
{% if exporter.show_qrcode %}
<span class="export-qrcode">
<i class="fa fa-qrcode"></i>
<div class="export-qrcode-image">{{ exporter.get_qrcode }}</div>
</span>
{% endif %}
</a>
{% endfor %}
</div>
</details>
{% endblock header_right %}

{% block agenda_content %}
<div id="fahrplan" class="{% if show_talk_list %}list{% else %}grid{% endif %}">
{% if schedule != schedule.event.current_schedule %}
<div class="alert alert-warning m-3">
<span>
{% if not schedule.version %}
{{ phrases.schedule.wip_version }}
{% else %}
{{ phrases.schedule.old_version }}
{% endif %}
{% if request.event.current_schedule %}
{% phrase "phrases.schedule.current_version" current_url=schedule.event.urls.schedule %}
{% endif %}
</span>
</div>
{% endif %}
<div id="fahrplan" class="{% if show_talk_list %}list{% else %}grid{% endif %}">
{% if schedule != schedule.event.current_schedule %}
<div class="alert alert-warning m-3">
<span>
{% if not schedule.version %}
{{ phrases.schedule.wip_version }}
{% else %}
{{ phrases.schedule.old_version }}
{% endif %}
{% if request.event.current_schedule %}
{% phrase "phrases.schedule.current_version" current_url=schedule.event.urls.schedule %}
{% endif %}
</span>
</div>
{% endif %}

<script type="text/javascript" src="{{ request.event.urls.schedule_widget_script }}" async></script>
<script type="text/javascript" src="{{ request.event.urls.schedule_widget_script }}" async></script>

<pretalx-schedule
event-url="{{ request.event.urls.base }}"
version="{{ schedule.url_version }}"
locale="{{ request.LANGUAGE_CODE }}"
timezone="{{ request.event.timezone }}"
{% if show_talk_list %}format="list"{% endif %}
style="--pretalx-clr-primary: {{ request.event.visible_primary_color }}"
></pretalx-schedule>
<noscript class="d-block">
<div class="alert alert-info m-4">
<div></div>
<div>
{% blocktranslate trimmed with href=request.event.urls.schedule_nojs %}
To see our schedule, please either enable JavaScript or go <a href="{{ href }}">here</a> for our NoJS schedule.
{% endblocktranslate %}
</div>
<pretalx-schedule event-url="{{ request.event.urls.base }}" version="{{ schedule.url_version }}" locale="{{ request.LANGUAGE_CODE }}" timezone="{{ request.event.timezone }}" {% if show_talk_list %}format="list"{% endif %} style="--pretalx-clr-primary: {{ request.event.visible_primary_color }}" disable-auto-scroll></pretalx-schedule>
<noscript class="d-block">
<div class="alert alert-info m-4">
<div></div>
<div>
{% blocktranslate trimmed with href=request.event.urls.schedule_nojs %}
To see our schedule, please either enable JavaScript or go <a href="{{ href }}">here</a> for our NoJS schedule.
{% endblocktranslate %}
</div>
</noscript>
</div>

</div>
</noscript>
</div>
{% endblock agenda_content %}
27 changes: 19 additions & 8 deletions app/eventyay/static/agenda/js/pretalx-schedule.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18594,7 +18594,8 @@ const T_ = ".c-linear-schedule{display:flex;flex-direction:column;min-height:0}.
currentDay: String,
now: Object,
scrollParent: Element,
onHomeServer: Boolean
onHomeServer: Boolean,
disableAutoScroll: Boolean
},
data() {
return {
Expand Down Expand Up @@ -18633,7 +18634,7 @@ const T_ = ".c-linear-schedule{display:flex;flex-direction:column;min-height:0}.
}
let t = !1;
const n = window.location.hash.slice(1);
if (n && n.length === 10 && de.fromISO(n, { zone: this.timezone }) && (t = !0), t) return;
if (n && n.length === 10 && de.fromISO(n, { zone: this.timezone }) && (t = !0), t || this.disableAutoScroll) return;
const r = this.sessionBuckets.findIndex((a) => this.now < a.date);
if (r < 0) return;
const i = this.sessionBuckets[Math.max(0, r - 1)], u = ((o = (s = this.$refs[this.getBucketName(i.date)]) == null ? void 0 : s[0]) == null ? void 0 : o.offsetTop) - 90;
Expand Down Expand Up @@ -18784,7 +18785,8 @@ const H_ = '.c-grid-schedule{flex:auto;background-color:#fafafa}.c-grid-schedule
locale: String,
hasAmPm: Boolean,
scrollParent: Element,
onHomeServer: Boolean
onHomeServer: Boolean,
disableAutoScroll: Boolean
},
data() {
return {
Expand Down Expand Up @@ -18898,7 +18900,7 @@ const H_ = '.c-grid-schedule{flex:auto;background-color:#fafafa}.c-grid-schedule
await this.$nextTick();
let e = !1;
const t = window.location.hash.slice(1);
if (t && t.length === 10 && de.fromISO(t, { zone: this.timezone }) && (e = !0), e || !this.$refs.now) return;
if (t && t.length === 10 && de.fromISO(t, { zone: this.timezone }) && (e = !0), e || !this.$refs.now || this.disableAutoScroll) return;
const n = this.$refs.now.offsetTop + this.getOffsetTop();
this.scrollParent ? this.scrollParent.scrollTop = n : window.scroll({ top: n });
},
Expand Down Expand Up @@ -18978,10 +18980,11 @@ function $_(e, t, n, r, i, u) {
scrollParent: n.scrollParent,
favs: n.favs,
onHomeServer: n.onHomeServer,
disableAutoScroll: n.disableAutoScroll,
onChangeDay: t[0] || (t[0] = (a) => e.$emit("changeDay", a)),
onFav: t[1] || (t[1] = (a) => e.$emit("fav", a)),
onUnfav: t[2] || (t[2] = (a) => e.$emit("unfav", a))
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer"]))), 128))
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer", "disableAutoScroll"]))), 128))
]);
}
const Z_ = {
Expand All @@ -19002,7 +19005,8 @@ const Z_ = {
locale: String,
hasAmPm: Boolean,
scrollParent: Element,
onHomeServer: Boolean
onHomeServer: Boolean,
disableAutoScroll: Boolean
},
computed: {
gridGroups() {
Expand Down Expand Up @@ -19614,10 +19618,11 @@ function h6(e, t, n, r, i, u) {
scrollParent: e.scrollParent,
favs: i.favs,
onHomeServer: i.onHomeServer,
disableAutoScroll: n.disableAutoScroll,
onChangeDay: t[4] || (t[4] = (h) => u.setCurrentDay(h)),
onFav: t[5] || (t[5] = (h) => u.fav(h)),
onUnfav: t[6] || (t[6] = (h) => u.unfav(h))
}, null, 8, ["sessions", "rooms", "days", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer"])) : (N(), ct(l, {
}, null, 8, ["sessions", "rooms", "days", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer", "disableAutoScroll"])) : (N(), ct(l, {
key: 2,
sessions: u.sessions,
rooms: u.rooms,
Expand All @@ -19629,10 +19634,11 @@ function h6(e, t, n, r, i, u) {
scrollParent: e.scrollParent,
favs: i.favs,
onHomeServer: i.onHomeServer,
disableAutoScroll: n.disableAutoScroll,
onChangeDay: t[7] || (t[7] = (h) => u.setCurrentDay(h)),
onFav: t[8] || (t[8] = (h) => u.fav(h)),
onUnfav: t[9] || (t[9] = (h) => u.unfav(h))
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer"]))
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer", "disableAutoScroll"]))
], 64)) : (N(), ct(f, {
key: 2,
size: "huge",
Expand Down Expand Up @@ -19703,6 +19709,11 @@ const p6 = 'html{font-size:14px;font-size:87.5%}body{font-family:Roboto,Helvetic
dateFilter: {
type: String,
default: ""
},
// Disable auto-scroll to current time on page load
disableAutoScroll: {
type: Boolean,
default: !1
}
},
provide() {
Expand Down