Jelajahi Sumber

prevent opening modal with keyboard shortcuts when another modal has already opened

Yuki Takei 8 tahun lalu
induk
melakukan
d06e7b8865
1 mengubah file dengan 9 tambahan dan 2 penghapusan
  1. 9 2
      resource/js/legacy/crowi.js

+ 9 - 2
resource/js/legacy/crowi.js

@@ -966,9 +966,16 @@ window.addEventListener('hashchange', function(e) {
 });
 });
 
 
 window.addEventListener('keypress', (event) => {
 window.addEventListener('keypress', (event) => {
+  const target = event.target;
+
   // ignore when target dom is input
   // ignore when target dom is input
-  const inputPattern = /input|textinput|textarea/i;
-  if (event.target.tagName.match(inputPattern)) {
+  const inputPattern = /^input|textinput|textarea$/i;
+  if (target.tagName.match(inputPattern)) {
+    return;
+  }
+
+  // ignore when dom that has 'modal in' classes exists
+  if (document.getElementsByClassName('modal in').length > 0) {
     return;
     return;
   }
   }