From ba916b70bdadb2ce787bc663ca7c85d303183b04 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Laptop.fritz.box>
Date: Wed, 27 May 2020 13:32:07 +0200
Subject: [PATCH] Change location where socket is initialized...again
---
app/static/js/nopaque.js | 2 +-
app/templates/nopaque.html.j2 | 22 +++++++++-------------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/app/static/js/nopaque.js b/app/static/js/nopaque.js
index 69e5682c..7677b06d 100644
--- a/app/static/js/nopaque.js
+++ b/app/static/js/nopaque.js
@@ -201,7 +201,7 @@ nopaque.flash = function() {
}
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", () => {
// Disable all option elements with no value
for (let optionElement of document.querySelectorAll('option[value=""]')) {
optionElement.disabled = true;
diff --git a/app/templates/nopaque.html.j2 b/app/templates/nopaque.html.j2
index 29fc59ed..baf314db 100644
--- a/app/templates/nopaque.html.j2
+++ b/app/templates/nopaque.html.j2
@@ -44,17 +44,21 @@
{% endif %}
<script src="{{ url_for('static', filename='js/JSONPatch.js/jsonpatch.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/Dark_Reader/darkreader.js') }}"></script>
- {% if current_user.is_authenticated and current_user.setting_dark_mode %}
- <script>
- DarkReader.enable({"brightness": 150, "contrast": 100, "sepia": 0});
- </script>
- {% endif %}
<script src="{{ url_for('static', filename='js/List.js/list.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/Socket.IO/socket.io.slim.js') }}"></script>
<script src="{{ url_for('static', filename='js/nopaque.js') }}"></script>
<script src="{{ url_for('static', filename='js/nopaque.lists.js') }}"></script>
<script>
+ {% if current_user.is_authenticated %}
+ {% if current_user.setting_dark_mode %}
+ DarkReader.enable({"brightness": 150, "contrast": 100, "sepia": 0});
+ {% endif %}
+ document.addEventListener("DOMContentLoaded", () => {
+ nopaque.socket.init();
+ nopaque.socket.emit("user_data_stream_init");
+ });
nopaque.flashedMessages = {{ get_flashed_messages(with_categories=True)|tojson }};
+ {% endif %}
</script>
</head>
<body>
@@ -235,13 +239,5 @@
-->
<script src="{{ url_for('static', filename='js/Materialize/materialize.min.js') }}"></script>
- <script>
- document.addEventListener("DOMContentLoaded", function() {
- {% if current_user.is_authenticated %}
- nopaque.socket.init();
- nopaque.socket.emit("user_data_stream_init");
- {% endif %}
- });
- </script>
</body>
</html>
--
GitLab