butter/keanu-weblite
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '478-seen-by-no-members-is-displayed-when-we-type-in-new-message' into 'dev'

Browse source 
Resolve ""Seen by no members" is displayed when we type in new message"

Closes #478

See merge request keanuapp/keanuapp-weblite!184
This commit is contained in:
N Pex 2023-05-11 08:41:20 +00:00
commit 817ca0c801
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/Chat.vue
View file

@ -52,7 +52,7 @@
touchStart(e, event); touchStart(e, event);
} }
" v-on:touchend="touchEnd" v-on:touchcancel="touchCancel" v-on:touchmove="touchMove"> " v-on:touchend="touchEnd" v-on:touchcancel="touchCancel" v-on:touchmove="touchMove">
<component :is="componentForEvent(event)" :room="room" :originalEvent="event" :nextEvent="events[index + 1]" <component :is="componentForEvent(event)" :room="room" :originalEvent="event" :nextEvent="filteredEvents[index + 1]"
:timelineSet="timelineSet" v-on:send-quick-reaction.stop="sendQuickReaction" :timelineSet="timelineSet" v-on:send-quick-reaction.stop="sendQuickReaction"
v-on:context-menu="showContextMenuForEvent($event)" v-on:own-avatar-clicked="viewProfile" v-on:context-menu="showContextMenuForEvent($event)" v-on:own-avatar-clicked="viewProfile"
v-on:other-avatar-clicked="showAvatarMenuForEvent($event)" v-on:download="download(event)" v-on:other-avatar-clicked="showAvatarMenuForEvent($event)" v-on:download="download(event)"
@ -64,7 +64,7 @@
/> />
<!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> --> <!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> -->
<!-- <div v-if="debugging" style="user-select:text">Event: {{ JSON.stringify(event) }}</div> --> <!-- <div v-if="debugging" style="user-select:text">Event: {{ JSON.stringify(event) }}</div> -->
<div v-if="event.getId() == readMarker && index < events.length - 1" class="read-marker" <div v-if="event.getId() == readMarker && index < filteredEvents.length - 1" class="read-marker"
:title="$t('message.unread_messages')" /> :title="$t('message.unread_messages')" />
</div> </div>
</div> </div>

2
src/components/messages/SeenBy.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<div class="seen-by-container"> <div class="seen-by-container">
<v-tooltip top open-delay="500"> <v-tooltip top open-delay="500" v-if="seenBy.length > 0">
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<div v-bind="attrs" v-on="on" class="clickable"> <div v-bind="attrs" v-on="on" class="clickable">
<div class="more" v-if="seenBy.length > 0">{{ moreItems }}</div> <div class="more" v-if="seenBy.length > 0">{{ moreItems }}</div>