summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2019-10-04 18:56:55 -0100
committerGitHub <noreply@github.com>2019-10-04 18:56:55 -0100
commitd82cb4906b38cc61630f34a3bbfbdd339bc4a55e (patch)
treeae85237739238ab68c3b50060f2c7cd2488faf1a /src
parent7ac1be654595626fa299d2918159ca16e43b4a3f (diff)
parentd055a2efcf8ec8077d5d0e2445a82d811eae97a5 (diff)
Merge pull request #785 from StCyr/bugfix/noid/do-not-post-on-enter
FIX: Hitting 'Enter' without the shift key pressed should not post the message
Diffstat (limited to 'src')
-rw-r--r--src/components/Composer.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 7f186b2a..e34f2d37 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -49,7 +49,7 @@
<vue-tribute :options="tributeOptions">
<!-- eslint-disable-next-line vue/valid-v-model -->
<div ref="composerInput" v-contenteditable:post.dangerousHTML="canType && !loading" class="message"
- placeholder="What would you like to share?" :class="{'icon-loading': loading}" @keyup.enter="keyup"
+ placeholder="What would you like to share?" :class="{'icon-loading': loading}" @keyup.prevent.enter="keyup"
@tribute-replaced="updatePostFromTribute" />
</vue-tribute>
<emoji-picker ref="emojiPicker" :search="search" class="emoji-picker-wrapper"
@@ -777,7 +777,7 @@ export default {
return data
},
keyup(event) {
- if (event.shiftKey) {
+ if (event.shiftKey || event.ctrlKey) {
this.createPost(event)
}
},