From 74b9816713c0dce0a4c93c6b26f4b933e879fb04 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 25 Jun 2024 19:08:48 +0200
Subject: [PATCH] Fix bubble.js initialization
---
app/scodoc/html_sco_header.py | 19 ++++++++++++++++---
app/templates/sco_page.j2 | 10 ++++++++--
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py
index 5d42e3d9..c46dd3ac 100644
--- a/app/scodoc/html_sco_header.py
+++ b/app/scodoc/html_sco_header.py
@@ -100,7 +100,14 @@ _HTML_BEGIN = f"""<!DOCTYPE html>
<script src="{scu.STATIC_DIR}/libjs/menu.js"></script>
<script src="{scu.STATIC_DIR}/libjs/bubble.js"></script>
<script>
- window.onload=function(){{enableTooltips("gtrcontent"); enableTooltips("sidebar");}};
+ window.onload=function(){{
+ if (document.getElementById('gtrcontent')) {{
+ enableTooltips("gtrcontent");
+ }}
+ if (document.getElementById('sidebar')) {{
+ enableTooltips("sidebar");
+ }}
+ }};
</script>
<script src="{scu.STATIC_DIR}/jQuery/jquery.js"></script>
@@ -217,8 +224,14 @@ def sco_header(
<script src="{scu.STATIC_DIR}/libjs/menu.js"></script>
<script src="{scu.STATIC_DIR}/libjs/bubble.js"></script>
<script>
- window.onload=function(){{enableTooltips("gtrcontent"); enableTooltips("sidebar");}};
-
+ window.onload=function(){{
+ if (document.getElementById('gtrcontent')) {{
+ enableTooltips("gtrcontent");
+ }}
+ if (document.getElementById('sidebar')) {{
+ enableTooltips("sidebar");
+ }}
+ }};
const SCO_URL="{url_for("scolar.index_html", scodoc_dept=g.scodoc_dept)}";
const SCO_TIMEZONE="{scu.TIME_ZONE}";
</script>"""
diff --git a/app/templates/sco_page.j2 b/app/templates/sco_page.j2
index 53883f74..26e035ec 100644
--- a/app/templates/sco_page.j2
+++ b/app/templates/sco_page.j2
@@ -49,8 +49,14 @@
<script src="{{scu.STATIC_DIR}}/js/scodoc.js"></script>
<script src="{{scu.STATIC_DIR}}/DataTables/datatables.min.js"></script>
<script>
- window.onload = function () { enableTooltips("gtrcontent"); enableTooltips("sidebar"); };
-
+ window.onload = function () {
+ if (document.getElementById('gtrcontent')) {
+ enableTooltips("gtrcontent");
+ }
+ if (document.getElementById('sidebar')) {
+ enableTooltips("sidebar");
+ }
+ };
const SCO_URL = "{{ url_for('scolar.index_html', scodoc_dept=g.scodoc_dept) }}";
</script>
--
GitLab