From 007aeaa2b62a0f6599e1e23f3a099eda356e72e9 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 23 Nov 2022 11:57:52 +0100
Subject: [PATCH] Fix session modal overlap [SCI-7522]

---
 app/assets/javascripts/application.js.erb        | 2 +-
 app/assets/javascripts/sitewide/show_password.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index e4c23ae74..617f8f195 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -319,7 +319,7 @@ window.I18n = I18n
 
 // Multiple modal support
 // https://stackoverflow.com/a/24914782
-$(document).on('show.bs.modal', '.modal', function() {
+$(document).on('shown.bs.modal', '.modal', function() {
   const zIndex = 1040 + 10 * $('.modal:visible').length;
   $(this).css('z-index', zIndex);
   setTimeout(() => $('.modal-backdrop').not('.modal-stack').css('z-index', zIndex - 1).addClass('modal-stack'));
diff --git a/app/assets/javascripts/sitewide/show_password.js b/app/assets/javascripts/sitewide/show_password.js
index eb44099e1..9a437ca86 100644
--- a/app/assets/javascripts/sitewide/show_password.js
+++ b/app/assets/javascripts/sitewide/show_password.js
@@ -12,7 +12,7 @@ function initShowPassword() {
 }
 
 $(document).on('turbolinks:load', function() {
-  initShowPassword()
+  initShowPassword();
 });
 
 $(document).on('click', '.show-password', function() {