Merge branch 'fosatech:main' into main

ScriptTactics · Feb 23, 2024 · df6641d · df6641d
2 parents 3acd7ec + dd20897
commit df6641d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -30,7 +30,6 @@ six==1.16.0
 SQLAlchemy==2.0.23
 typing-extensions==4.9.0
 urllib3==2.1.0
-uWSGI==2.0.23
 waitress==2.1.2
 werkzeug==3.0.1
 wsproto==1.2.0

diff --git a/webapp/static/js/rtlDataDisplay.js b/webapp/static/js/rtlDataDisplay.js
@@ -525,10 +525,12 @@ document.getElementById("settingsBtn").onclick = function() {
     document.getElementById("settingsPopup").style.display = "block";
 };
 
-document.querySelector(".close-btn").onclick = function() {
-    document.getElementById("settingsPopup").style.display = "none";
-    document.getElementById("olympusPopup").style.display = "none";
-};
+document.querySelectorAll(".close-btn").forEach(button => {
+    button.addEventListener('click', function(event) {
+        document.getElementById("settingsPopup").style.display = "none";
+        document.getElementById("olympusPopup").style.display = "none";
+    })
+})
 
 // Close the popup if user clicks outside of it
 window.onclick = function(event) {