From 145bae4677df98cd4bc7db3af1ee72fd481d89d4 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Tue, 4 Jul 2017 15:48:18 -0300 Subject: [PATCH 1/2] [FIX] Fix Unread Bar Disapearing --- packages/rocketchat-ui/client/lib/readMessages.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/rocketchat-ui/client/lib/readMessages.js b/packages/rocketchat-ui/client/lib/readMessages.js index fb41552e8879..1934fab0f8bc 100644 --- a/packages/rocketchat-ui/client/lib/readMessages.js +++ b/packages/rocketchat-ui/client/lib/readMessages.js @@ -74,6 +74,8 @@ const readMessage = new class { if (this.debug) { console.log('readMessage -> readNow canceled, unread mark visible:', visible, 'unread since exists', (room.unreadSince.get() != null)); } return; } + } else { + return; } if (this.debug) { console.log('readMessage -> readNow rid:', rid); } From fd55fc28db7fea63fb7dbb164bff0a774eb0c09a Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Tue, 4 Jul 2017 16:42:00 -0300 Subject: [PATCH 2/2] Fix permanent number on channel --- packages/rocketchat-ui/client/lib/readMessages.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-ui/client/lib/readMessages.js b/packages/rocketchat-ui/client/lib/readMessages.js index 1934fab0f8bc..249cf12f40b1 100644 --- a/packages/rocketchat-ui/client/lib/readMessages.js +++ b/packages/rocketchat-ui/client/lib/readMessages.js @@ -74,7 +74,8 @@ const readMessage = new class { if (this.debug) { console.log('readMessage -> readNow canceled, unread mark visible:', visible, 'unread since exists', (room.unreadSince.get() != null)); } return; } - } else { + // if unread mark is not visible and there is more more not loaded unread messages + } else if (RoomHistoryManager.getRoom(rid).unreadNotLoaded.get() > 0) { return; }