From c5619be74ecac4d4aa535fa02e6eea4ba98702de Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 10 Jan 2020 09:26:11 +0100 Subject: Increase the max height of the mention suggestion to 4.5 mentions instead of 3 Signed-off-by: Joas Schilling --- css/At.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/css/At.scss b/css/At.scss index 4443fa18b..b473e36eb 100644 --- a/css/At.scss +++ b/css/At.scss @@ -114,6 +114,12 @@ max-width: unset; } + // Override max height to show 4.5 mentions to make clear you can scroll for more options + .atwho-ul { + // (padding top: 6 + avatar height: 32 + padding bottom: 6) * visible mentions: 4.5 + max-height: 198px; + } + // Override autocompletion panel items height, as they are too short // for the avatars and also need some padding. .atwho-li { -- cgit v1.2.3 From 0ef29e161608b230c8b4af8df23d15ab7e866ae4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 10 Jan 2020 09:44:55 +0100 Subject: Re-enable mentions for other things as its only broken in dev mode Signed-off-by: Joas Schilling --- src/components/MessagesList/MessagesGroup/Message/Message.vue | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index 5b2c317e4..c7567e7fa 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -287,12 +287,10 @@ export default { return PlainText } else if (messagePartType === 'user') { return Mention - // FIXME Reenable once the UserBubble allows non-users - // FIXME Ref: https://github.com/nextcloud/nextcloud-vue/issues/796 - // } else if (messagePartType === 'call') { - // return Mention - // } else if (messagePartType === 'guest') { - // return Mention + } else if (messagePartType === 'call') { + return Mention + } else if (messagePartType === 'guest') { + return Mention } else if (messagePartType === 'file') { return FilePreview } -- cgit v1.2.3 From 58d7618e34791483799ec9512170bf7134ff0007 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 10 Jan 2020 09:47:17 +0100 Subject: Fix loading the avatar of users with a space in their id Signed-off-by: Joas Schilling --- src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue index bf63e01d4..3c5df76f1 100644 --- a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue +++ b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue @@ -38,7 +38,7 @@ {{ getFirstLetterOfGuestName(scope.item.label) }} @@ -195,6 +195,13 @@ export default { return true }, + atRemoveQuotesFromUserIdForAvatars(userId) { + if (userId.startsWith('"')) { + return userId.substring(1, userId.length - 1) + } + return userId + }, + /** * Focuses the contenteditable div input */ @@ -207,6 +214,7 @@ export default { }, 0) } }, + /** * Emits the submit event when enter is pressed (look * at the v-on in the template) unless shift is pressed: -- cgit v1.2.3