From 65e3b599e65d660ddd8db96eb722f0154bc46c27 Mon Sep 17 00:00:00 2001 From: Feywood Date: Tue, 5 Dec 2017 21:05:01 +0100 Subject: [PATCH] Fix for sending chat with ctrl enter for windows chrome/firefox. Fixes https://github.com/HabitRPG/habitica/issues/9380 (#9588) * testing additional event trigger for sendMessage * moved keyup event to newmessage * added keyup event to tavern vue too * removed obsolete check from _updateCarretPosition * fixed lint issue --- website/client/components/groups/group.vue | 7 +------ website/client/components/groups/tavern.vue | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index f1da880bb7..40e7b8e1af 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -30,7 +30,7 @@ h3(v-once) {{ $t('chat') }} .row.new-message-row - textarea(:placeholder="!isParty ? $t('chatPlaceholder') : $t('partyChatPlaceholder')", v-model='newMessage', @keydown='updateCarretPosition') + textarea(:placeholder="!isParty ? $t('chatPlaceholder') : $t('partyChatPlaceholder')", v-model='newMessage', @keydown='updateCarretPosition', @keyup.ctrl.enter='sendMessage()') autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :chat='group.chat') .row @@ -726,11 +726,6 @@ export default { this._updateCarretPosition(eventUpdate); }, 250), _updateCarretPosition (eventUpdate) { - if (eventUpdate.metaKey && eventUpdate.keyCode === 13) { - this.sendMessage(); - return; - } - let text = eventUpdate.target; this.getCoord(eventUpdate, text); }, diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue index 87c43a0e4a..1780a9297c 100644 --- a/website/client/components/groups/tavern.vue +++ b/website/client/components/groups/tavern.vue @@ -10,7 +10,7 @@ h3(v-once) {{ $t('tavernChat') }} .row - textarea(:placeholder="$t('tavernCommunityGuidelinesPlaceholder')", v-model='newMessage', :class='{"user-entry": newMessage}', @keydown='updateCarretPosition') + textarea(:placeholder="$t('tavernCommunityGuidelinesPlaceholder')", v-model='newMessage', :class='{"user-entry": newMessage}', @keydown='updateCarretPosition', @keyup.ctrl.enter='sendMessage()') autocomplete(:text='newMessage', v-on:select="selectedAutocomplete", :coords='coords', :chat='group.chat') .row @@ -532,11 +532,6 @@ export default { this._updateCarretPosition(eventUpdate); }, 250), _updateCarretPosition (eventUpdate) { - if (eventUpdate.metaKey && eventUpdate.keyCode === 13) { - this.sendMessage(); - return; - } - let text = eventUpdate.target; this.getCoord(eventUpdate, text); },