Merge pull request #249 from weseek/master

release v2.3.7

CHANGES.md

@@ -1,6 +1,11 @@
 CHANGES
 ========
 
+## 2.3.7
+
+* Fix: Open popups when `Ctrl+C` pressed
+    * Introduced by 2.3.5
+
 ## 2.3.6
 
 * Feature: Theme Selector for Editor

lib/views/crowi-plus/widget/system-version.html

@@ -18,7 +18,7 @@
       element.classList.add('mac');
     }
     else {
-      element.classList.add('win', 'key-longer');
+      element.classList.add('win');
     }
-  })
+  });
 </script>

lib/views/modal/shortcuts.html

@@ -68,9 +68,12 @@
     var isMac = (platform.indexOf('mac') > -1);
 
     document.querySelectorAll('#shortcuts-modal .cmd-key').forEach((element) => {
-      if (!isMac) {
-        element.classList.add('key-longer');
+      if (isMac) {
+        element.classList.add('mac');
       }
-    })
+      else {
+        element.classList.add('win', 'key-longer');
+      }
+    });
   </script>
 </div><!-- /.modal -->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crowi-plus",
-  "version": "2.3.6-RC",
+  "version": "2.3.7-RC",
   "description": "Enhanced Crowi",
   "tags": [
     "wiki",

resource/js/legacy/crowi.js

@@ -453,7 +453,7 @@ $(function() {
   });
 
   /*
-   * wrap short path with <strong></strong> 
+   * wrap short path with <strong></strong>
    */
   $('.page-list-link').each(function() {
     var $link = $(this);
@@ -974,14 +974,19 @@ window.addEventListener('keypress', (event) => {
 
   switch (event.key) {
     case 'e':
-      Crowi.handleKeyEHandler(event);
+      if (!event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey) {
+        Crowi.handleKeyEHandler(event);
+      }
       break;
     case 'c':
-      Crowi.handleKeyCHandler(event);
+      if (!event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey) {
+        Crowi.handleKeyCHandler(event);
+      }
+      break;
     case '/':
       if (event.ctrlKey || event.metaKey) {
         Crowi.handleKeyCtrlSlashHandler(event);
       }
-    break;
+      break;
   }
 });