BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix chat sort and private chat close/restore

Browse Source
This commit is contained in:
Chad Pilkey 2019-09-05 11:26:54 -07:00
parent fd8d4fa76f
commit 3003afd13e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-html5/imports/ui/components/user-list/service.js
View File

@ -139,9 +139,9 @@ const sortChatsByName = (a, b) => {
return -1;
} if (a.name.toLowerCase() > b.name.toLowerCase()) {
return 1;
} if (a.id.toLowerCase() > b.id.toLowerCase()) {
} if (a.userId.toLowerCase() > b.userId.toLowerCase()) {
return -1;
} if (a.id.toLowerCase() < b.id.toLowerCase()) {
} if (a.userId.toLowerCase() < b.userId.toLowerCase()) {
return 1;
}
@ -253,15 +253,15 @@ const getActiveChats = (chatID) => {
activeChats.forEach((op) => {
// When a new private chat message is received, ensure the conversation view is restored.
if (op.unreadCounter > 0) {
if (_.indexOf(currentClosedChats, op.id) > -1) {
Storage.setItem(CLOSED_CHAT_LIST_KEY, _.without(currentClosedChats, op.id));
if (_.indexOf(currentClosedChats, op.userId) > -1) {
Storage.setItem(CLOSED_CHAT_LIST_KEY, _.without(currentClosedChats, op.userId));
}
}
// Compare activeChats with session and push it into filteredChatList
// if one of the activeChat is not in session.
// It will pass to activeChats.
if (_.indexOf(currentClosedChats, op.id) < 0) {
if (_.indexOf(currentClosedChats, op.userId) < 0) {
filteredChatList.push(op);
}
});