elements/modal: fix onexit logic in some cases

dat-ecosystem-archive · Mar 16, 2017 · b08cff0 · b08cff0
1 parent 5dd34bf
commit b08cff0
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/elements/modal.js b/elements/modal.js
@@ -246,9 +246,13 @@ function crashModal () {
 }
 
 function errorModal () {
-  return Modal({ render: render })
+  return Modal({
+    render: render,
+    onexit: onexit,
+    class: 'modal'
+  })
 
-  function render (message, onexit) {
+  function render (message) {
     var exitButton = button.green('Ok', {
       class: 'fr ml3',
       onclick: onexit
@@ -268,12 +272,21 @@ function errorModal () {
       </div>
     `
   }
+
+  function onexit () {
+    const el = document.querySelector('.modal')
+    if (el) el.parentNode.removeChild(el)
+  }
 }
 
 function warningModal () {
-  return Modal({ render: render })
+  return Modal({
+    render: render,
+    onexit: onexit,
+    class: 'modal'
+  })
 
-  function render (message, onexit) {
+  function render (message) {
     var exitButton = button.green('Ok', {
       class: 'fr ml3',
       onclick: onexit
@@ -293,6 +306,11 @@ function warningModal () {
       </div>
     `
   }
+
+  function onexit () {
+    const el = document.querySelector('.modal')
+    if (el) el.parentNode.removeChild(el)
+  }
 }
 
 function linkModal () {