Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-19 13:07:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow unread state toggling in chats dropdown too

Browse Source
This commit is contained in:
Julian Lam
2023-02-06 16:08:17 -05:00
parent fb54c7e8c0
commit 8a0afd8683
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/src/modules/chat.js
View File

@@ -128,23 +128,21 @@ define('chat', [
e.stopPropagation();
const chatEl = e.target.closest('[data-roomid]');
const unread = chatEl.classList.contains('unread');
if (unread) {
const roomId = chatEl.getAttribute('data-roomid');
api.del(`/chats/${roomId}/state`, {}).catch((err) => {
alerts.error(err);
const state = !chatEl.classList.contains('unread');
const roomId = chatEl.getAttribute('data-roomid');
api[state ? 'put' : 'del'](`/chats/${roomId}/state`, {}).catch((err) => {
alerts.error(err);
// Revert on failure
chatEl.classList.add('unread');
this.querySelector('.unread').classList.remove('hidden');
this.querySelector('.read').classList.add('hidden');
});
// Revert on failure
chatEl.classList[state ? 'remove' : 'add']('unread');
chatEl.querySelector('.unread').classList[state ? 'add' : 'remove']('hidden');
chatEl.querySelector('.read').classList[!state ? 'add' : 'remove']('hidden');
});
// Immediate feedback
chatEl.classList.remove('unread');
this.querySelector('.unread').classList.add('hidden');
this.querySelector('.read').classList.remove('hidden');
}
// Immediate feedback
chatEl.classList[state ? 'add' : 'remove']('unread');
chatEl.querySelector('.unread').classList[!state ? 'add' : 'remove']('hidden');
chatEl.querySelector('.read').classList[state ? 'add' : 'remove']('hidden');
});
$('[component="chats/mark-all-read"]').off('click').on('click', function () {

2
src/socket.io/modules.js
View File

@@ -1,10 +1,8 @@
'use strict';
const db = require('../database');
const notifications = require('../notifications');
const Messaging = require('../messaging');
const utils = require('../utils');
const server = require('./index');
const user = require('../user');
const privileges = require('../privileges');