From 38725ca37c2544c2f6c8a86ab1f09948c97dcf6c Mon Sep 17 00:00:00 2001
From: avele <34437766+avele@users.noreply.github.com>
Date: Mon, 2 Sep 2019 21:55:55 +0400
Subject: [PATCH] Cmd enter handling (#393)

---
 front/client/components/CategoryItemToolbar.vue | 5 ++++-
 front/client/components/MarkdownEditor.vue      | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/front/client/components/CategoryItemToolbar.vue b/front/client/components/CategoryItemToolbar.vue
index 8f737d3..58f316a 100644
--- a/front/client/components/CategoryItemToolbar.vue
+++ b/front/client/components/CategoryItemToolbar.vue
@@ -160,7 +160,10 @@
     >
       <v-layout column class="pa-3">
         <v-flex>
-          <v-form @keydown.native.enter.ctrl="updateItemInfo">
+          <v-form
+            @keydown.native.enter.ctrl="updateItemInfo"
+            @keydown.native.enter.meta="updateItemInfo"
+          >
             <v-text-field
               v-model="itemNameEdit"
               label="Name"
diff --git a/front/client/components/MarkdownEditor.vue b/front/client/components/MarkdownEditor.vue
index 5e09a66..7cacc8d 100644
--- a/front/client/components/MarkdownEditor.vue
+++ b/front/client/components/MarkdownEditor.vue
@@ -7,9 +7,10 @@
       'markdown-editor_has-bottom-toolbar': bottomToolbar,
       'markdown-editor_has-top-toolbar': toolbar
     }"
-    @keydown.capture.enter="onEnterDown"
-    @keydown.ctrl.enter="onCtrlEnterDown"
-    @keydown.esc="cancel"
+    @keydown.exact.capture.enter="onEnterDown"
+    @keydown.exact.ctrl.enter="onCtrlEnterDown"
+    @keydown.exact.meta.enter="onCtrlEnterDown"
+    @keydown.exact.esc="cancel"
     v-show="editor && isReady"
   >
     <textarea ref="editor" />
@@ -80,7 +81,7 @@ export default class MarkdownEditor extends Vue {
   isReady: boolean = false
 
   get saveTip () {
-    return `press${this.saveOnEnter ? ' Enter or' : ''} Ctrl+Enter to save`
+    return `press${this.saveOnEnter ? ' Enter or' : ''} Ctrl/Cmd + Enter to save`
   }
 
   get heightValue () {