From 27b657ebc2a5d17742c439a28aa2399141672b5a Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 21 Jun 2021 16:26:27 +0200 Subject: Focus on message field after joining While joining, the message field is disabled, so we need to set the focus afterwards. Signed-off-by: Vincent Petry --- src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue | 3 --- src/components/NewMessageForm/NewMessageForm.vue | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/components/NewMessageForm') diff --git a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue index e7ba6f5e9..ceb13069c 100644 --- a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue +++ b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue @@ -237,18 +237,15 @@ export default { }, mounted() { - this.focusInput() /** * Listen to routeChange global events and focus on the */ - EventBus.$on('routeChange', this.focusInput) EventBus.$on('focusChatInput', this.focusInput) this.atWhoPanelExtraClasses = 'talk candidate-mentions' }, beforeDestroy() { - EventBus.$off('routeChange', this.focusInput) EventBus.$off('focusChatInput', this.focusInput) }, diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue index d1fd2064b..db5d335ca 100644 --- a/src/components/NewMessageForm/NewMessageForm.vue +++ b/src/components/NewMessageForm/NewMessageForm.vue @@ -247,6 +247,10 @@ export default { }, watch: { + currentConversationIsJoined(newValue) { + this.$refs.advancedInput.focusInput() + }, + disabled(newValue) { // the menu is not always available if (!this.$refs.uploadMenu) { -- cgit v1.2.3