Просмотр исходного кода

Fix: Ensure to close Shortcuts help with Ctrl-/

Yuki Takei 8 лет назад
Родитель
Сommit
6ccf2f34a6
1 измененных файлов с 8 добавлено и 5 удалено
  1. 8 5
      resource/js/legacy/crowi.js

+ 8 - 5
resource/js/legacy/crowi.js

@@ -189,11 +189,19 @@ Crowi.updateCurrentRevision = function(revisionId) {
 }
 
 Crowi.handleKeyEHandler = (event) => {
+  // ignore when dom that has 'modal in' classes exists
+  if (document.getElementsByClassName('modal in').length > 0) {
+    return;
+  }
   // show editor
   $('a[data-toggle="tab"][href="#edit-form"]').tab('show');
 }
 
 Crowi.handleKeyCHandler = (event) => {
+  // ignore when dom that has 'modal in' classes exists
+  if (document.getElementsByClassName('modal in').length > 0) {
+    return;
+  }
   // show modal to create a page
   $('#create-page').modal();
 }
@@ -975,11 +983,6 @@ window.addEventListener('keypress', (event) => {
     return;
   }
 
-  // ignore when dom that has 'modal in' classes exists
-  if (document.getElementsByClassName('modal in').length > 0) {
-    return;
-  }
-
   switch (event.key) {
     case 'e':
       if (!event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey) {