From f46662bb83ee4bb9a87c3809d784e859b050cbc7 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 18 Feb 2025 11:22:18 +0100
Subject: [PATCH] Fix broken tagging in some pages' player control display.
---
src/templates/_base.tmpl | 8 +++++++-
src/templates/_macros.tmpl | 9 ---------
src/templates/files.tmpl | 1 -
src/templates/playlist.tmpl | 1 -
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/templates/_base.tmpl b/src/templates/_base.tmpl
index e90f9f8..4d2f21e 100644
--- a/src/templates/_base.tmpl
+++ b/src/templates/_base.tmpl
@@ -4,7 +4,6 @@
<head>
<meta charset="UTF-8">
<script>
-
const RETRY_INTERVAL_S = 5;
const PATH_EVENTS = "/{{page_names.events}}";
const PATH_PLAYER = "/{{page_names.player}}";
@@ -14,6 +13,13 @@ var event_handlers = [];
var events_params = "";
var events_stream = null;
+function new_child_to(tag, parent, textContent='') {
+ const el = document.createElement(tag);
+ parent.appendChild(el);
+ el.textContent = textContent;
+ return el;
+}
+
window.addEventListener(
"beforeunload", function() {
if (events_stream) {
diff --git a/src/templates/_macros.tmpl b/src/templates/_macros.tmpl
index 602d2d3..9c70226 100644
--- a/src/templates/_macros.tmpl
+++ b/src/templates/_macros.tmpl
@@ -3,12 +3,3 @@
{% if display_name %}{{display_name}}{% else %}{{target}}{% endif %}
{% if cond %}</a>{% endif %}
{% endmacro %}
-
-
-{% macro js_new_child_to() %}
-function new_child_to(tag, parent, textContent='') {
- const el = document.createElement(tag);
- parent.appendChild(el);
- el.textContent = textContent;
- return el; }
-{% endmacro %}
diff --git a/src/templates/files.tmpl b/src/templates/files.tmpl
index 88bc7a7..553fe03 100644
--- a/src/templates/files.tmpl
+++ b/src/templates/files.tmpl
@@ -2,7 +2,6 @@
{% block script %}
-{{ macros.js_new_child_to() }}
const PATH_FILES_JSON = "/{{page_names.files_json}}";
const all_tags = {{showable_tags|tojson|safe}};
diff --git a/src/templates/playlist.tmpl b/src/templates/playlist.tmpl
index 6f19dc3..0332351 100644
--- a/src/templates/playlist.tmpl
+++ b/src/templates/playlist.tmpl
@@ -7,7 +7,6 @@ td.entry_control { width: 6em; }
{% block script %}
-{{ macros.js_new_child_to() }}
const CLS_PLAYLIST_ROW = 'playlist_row';
events_params += 'playlist=1';
--
2.30.2