Small refactor on modal dialog event

g0v · May 7, 2024 · 75bda16 · 75bda16
1 parent 66c7443
commit 75bda16
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 30 deletions.
diff --git a/src/assets/js/agenda.js b/src/assets/js/agenda.js
@@ -145,16 +145,3 @@ $('#tag-group-toggle').on('click', function (e) {
   e.preventDefault()
   $('#tag-group').toggleClass('show')
 })
-
-$('#modal .modal-close').on('click', function (e) {
-  e.preventDefault()
-  $('body').removeClass('overflow-hidden')
-  $('#modal').removeClass('show')
-  history.replaceState(null, null, window.location.pathname);
-})
-
-$(document).on('keydown', function (e) {
-  if (e.key === 'Escape') {
-    $('#modal .modal-close').click()
-  }
-});
diff --git a/src/assets/js/base.js b/src/assets/js/base.js
@@ -1,3 +1,4 @@
+// Global preferences
 const storage = window.sessionStorage
 const i18n = $.i18n()
 const setLocale = (function (lang) {
@@ -14,10 +15,6 @@ $('#cookie-notice button').on('click', function (e) {
   $('#cookie-notice').addClass('hidden')
 })
 
-$('header .offcanvas-toggler').on('click', function (e) {
-  $('header .offcanvas-box').toggleClass('show')
-})
-
 $('select#lang-select').on('change', function (e) {
   let lang = $(this).val()
   setLocale(lang)
@@ -64,10 +61,28 @@ $(function () {
   })
 })
 
+// UI interactions & events
 $(window).on('load', function (e) {
   $('body').css('overflow', 'unset')
   $('#loading').addClass('scale')
   setTimeout(function () {
     $('#loading').addClass('fadeout')
   }, 1000)
 })
+
+$('header .offcanvas-toggler').on('click', function (e) {
+  $('header .offcanvas-box').toggleClass('show')
+})
+
+$('#modal .modal-close').on('click', function (e) {
+  e.preventDefault()
+  $('body').removeClass('overflow-hidden')
+  $('#modal').removeClass('show')
+  history.replaceState(null, null, window.location.pathname);
+})
+
+$(document).on('keydown', function (e) {
+  if (e.key === 'Escape' && $('#modal').hasClass('show')) {
+    $('#modal .modal-close').click()
+  }
+})
diff --git a/src/assets/js/speakers.js b/src/assets/js/speakers.js
@@ -10,16 +10,3 @@ $(function () {
       }
     })
 })
-
-$('#modal .modal-close').on('click', function (e) {
-  e.preventDefault()
-  $('body').removeClass('overflow-hidden')
-  $('#modal').removeClass('show')
-  history.replaceState(null, null, window.location.pathname);
-})
-
-$(document).on('keydown', function (e) {
-  if (e.key === 'Escape') {
-    $('#modal .modal-close').click()
-  }
-});