Merge branch 'WebApi' of https://github.com/TrueDoctor/DiscoBot into WebApi

1 files changed, 13 insertions, 4 deletions

diff --git a/WebInterface/NodeJSServer/src/modules/ui/modal.js b/WebInterface/NodeJSServer/src/modules/ui/modal.js
index e1aa8a2..55e38bd 100644
--- a/WebInterface/NodeJSServer/src/modules/ui/modal.js
+++ b/WebInterface/NodeJSServer/src/modules/ui/modal.js
@@ -13,6 +13,7 @@ export default class Modal {
     title.textContent = titleString;
 
     modal.appendChild(title);
+    modal.appendChild(body);
     modalBackground.appendChild(modal);
     document.body.appendChild(modalBackground);
 
@@ -25,11 +26,19 @@ export default class Modal {
   }
 
   registerEvents() {
+    this.modal.addEventListener('click', (e) => {
+      e.stopPropagation();
+    });
+
     this.bg.addEventListener('click', () => {
-      this.bg.classList.add('hidden');
-      this.bg.addEventListener('transitionend', () => {
-        document.body.removeChild(this.bg);
-      });
+      this.close();
+    });
+  }
+
+  close() {
+    this.bg.classList.add('hidden');
+    this.bg.addEventListener('transitionend', () => {
+      document.body.removeChild(this.bg);
     });
   }