From 9afb9e2c0a08cf0a175afb32bb47023de7db35d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Fri, 10 Jul 2020 19:55:50 +0200 Subject: Fix popup close buttons, and ESC to close all. --- module/output/html.scm | 5 ++--- static/script.js | 10 +++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/module/output/html.scm b/module/output/html.scm index be48a636..14848335 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -164,14 +164,13 @@ "unknown")))) ,(btn "×" title: "Stäng" - onclick: "" + onclick: (format #f "close_popup(~a)" id) class: '("close-tooltip")) ,(btn "🗑" title: "Ta bort" ;; Apparently an id gets recieved ;; as the whole object in js. - onclick: (format #f "remove_event(~a)" - id))) + onclick: (format #f "remove_event(~a)" id))) ,(tabset (append diff --git a/static/script.js b/static/script.js index e7076f81..484eeb6c 100644 --- a/static/script.js +++ b/static/script.js @@ -258,9 +258,9 @@ function setVar(str, val) { } function close_all_popups () { - for (let popup of document.getElementsByClassName("tpd-tooltip")) { - popup.getElementsByClassName('close-tooltip')[0].click(); - } + for (let popup of document.querySelectorAll(".popup-container.visible")) { + close_popup(popup); + } } function sxml_to_xml(doc, tree) { @@ -408,6 +408,10 @@ window.onload = function () { } +function close_popup(popup) { + popup.classList.remove("visible"); +} + function toggle_child_popup(el) { let popup = el.getElementsByClassName("popup-container")[0]; popup.classList.toggle("visible"); -- cgit v1.2.3