Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNikola <nikola.gladovic@nextcloud.com>2022-04-12 22:24:18 +0300
committerJoas Schilling <coding@schilljs.com>2022-04-13 11:22:02 +0300
commitb66f6285802ea68b6c7ab8c4aba843b72c35bb2f (patch)
tree4cf529018c85e8a122589bb8ca90b87016114c2f /src
parentb7ac8951b4265f2cb32ea3ff5ec0bce5628f8982 (diff)
3299: updated unread message style issue
Diffstat (limited to 'src')
-rw-r--r--src/components/LeftSidebar/LeftSidebar.vue29
1 files changed, 11 insertions, 18 deletions
diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index a6b412166..ac635479b 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -91,8 +91,8 @@
<Hint v-else :hint="t('spreed', 'No search results')" />
</template>
</div>
- <Button v-if="!preventFindingUnread && unreadBottom > 0"
- class="unread-mention-button unread-mention-button__bottom"
+ <Button v-if="!preventFindingUnread && unreadNum > 0"
+ class="unread-mention-button"
type="primary"
@click="scrollBottomUnread">
{{ t('spreed', 'Unread mentions') }}
@@ -172,8 +172,8 @@ export default {
// Keeps track of whether the conversation list is scrolled to the top or not
isScrolledToTop: true,
refreshTimer: null,
- unreadBottom: 0,
- lastUnreadPos: 0,
+ unreadNum: 0,
+ firstUnreadPos: 0,
preventFindingUnread: false,
}
},
@@ -290,7 +290,7 @@ export default {
scrollBottomUnread() {
this.preventFindingUnread = true
this.$refs.scroller.scrollTo({
- top: this.lastUnreadPos - 150,
+ top: this.firstUnreadPos - 150,
behavior: 'smooth',
})
setTimeout(() => {
@@ -458,10 +458,6 @@ export default {
singleConversation: false,
})
this.isFetchingConversations = false
- this.handleUnreadMention()
- if (!this.$route.params.token) {
- this.scrollBottomUnread()
- }
} catch (error) {
console.debug('Error while fetching conversations: ', error)
this.isFetchingConversations = false
@@ -485,13 +481,15 @@ export default {
}
},
handleUnreadMention() {
- this.unreadBottom = 0
+ this.unreadNum = 0
const unreadMentions = document.getElementsByClassName('unread-mention-conversation')
unreadMentions.forEach(x => {
const pos = this.ensureInView(this.$refs.scroller, x)
if (pos === 'outside') {
- this.unreadBottom += 1
- this.lastUnreadPos = x.offsetTop
+ if (this.unreadNum === 0) {
+ this.firstUnreadPos = x.offsetTop
+ }
+ this.unreadNum += 1
}
})
},
@@ -529,11 +527,6 @@ export default {
left: 50%;
transform: translateX(-50%);
z-index: 100;
- &__top {
- top: 10px;
- }
- &__bottom {
- bottom: 10px;
- }
+ bottom: 10px;
}
</style>