Merge pull request trongate#96 from DaFa66/master

Awesome as always. Thank you!
sillycodes · Jul 21, 2022 · 6b9eec3 · 6b9eec3
2 parents 4510aec + 18900af
commit 6b9eec3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/public/js/admin.js b/public/js/admin.js
@@ -74,6 +74,17 @@ function closeModal() {
     overlay.remove();
 }
 
+function attemptEscCloseModal () {
+    document.onkeydown = function (e) {
+
+        var modalContainer = _("modal-container");
+
+        if ((e.key == "Escape") && (modalContainer)) {
+            closeModal();
+        }
+    };
+}
+
 function fetchAssociatedRecords(relationName, updateId) {
 
     var params = {
@@ -434,4 +445,6 @@ body.addEventListener('click', (ev) => {
             closeSlideNav();
         }
     }
-});
+});
+
+attemptEscCloseModal ();
diff --git a/public/js/app.js b/public/js/app.js
@@ -84,6 +84,17 @@ function closeModal() {
     overlay.remove();
 }
 
+function attemptEscCloseModal () {
+    document.onkeydown = function (e) {
+
+        var modalContainer = _("modal-container");
+
+        if ((e.key == "Escape") && (!modalContainer)) {
+            closeModal();
+        }
+    };
+}
+
 var slideNavLinks = document.querySelector("#slide-nav ul");
 
 if (slideNavLinks !== null) {
@@ -102,5 +113,6 @@ if (slideNavLinks !== null) {
             }
         }
     });
+}
 
-}
+attemptEscCloseModal ();