Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #7142

Browse Source 
due to no refresh on login socket listeners were added more than once,
so remove them before adding the listeners
This commit is contained in:
Baris Usakli
2019-01-02 13:16:56 -05:00
parent 8566205214
commit 8da3b2a487
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
public/src/client/header/chat.js
View File

@@ -18,19 +18,28 @@ define('forum/header/chat', ['components'], function (components) {
requireAndCall('loadChatsDropdown', chatsListEl);
}
socket.on('event:chats.receive', function (data) {
requireAndCall('onChatMessageReceived', data);
});
socket.removeListener('event:chats.receive', onChatMessageReceived);
socket.on('event:chats.receive', onChatMessageReceived);
socket.on('event:user_status_change', function (data) {
requireAndCall('onUserStatusChange', data);
});
socket.removeListener('event:user_status_change', onUserStatusChange);
socket.on('event:user_status_change', onUserStatusChange);
socket.on('event:chats.roomRename', function (data) {
requireAndCall('onRoomRename', data);
});
socket.removeListener('event:chats.roomRename', onRoomRename);
socket.on('event:chats.roomRename', onRoomRename);
};
function onChatMessageReceived(data) {
requireAndCall('onChatMessageReceived', data);
}
function onUserStatusChange(data) {
requireAndCall('onUserStatusChange', data);
}
function onRoomRename(data) {
requireAndCall('onRoomRename', data);
}
function requireAndCall(method, param) {
require(['chat'], function (chat) {
chat[method](param);

18
public/src/client/header/notifications.js
View File

@@ -21,15 +21,21 @@ define('forum/header/notifications', ['components'], function (components) {
requireAndCall('loadNotifications', notifList);
}
socket.on('event:new_notification', function (data) {
requireAndCall('onNewNotification', data);
});
socket.removeListener('event:new_notification', onNewNotification);
socket.on('event:new_notification', onNewNotification);
socket.on('event:notifications.updateCount', function (data) {
requireAndCall('updateNotifCount', data);
});
socket.removeListener('event:notifications.updateCount', onUpdateCount);
socket.on('event:notifications.updateCount', onUpdateCount);
};
function onNewNotification(data) {
requireAndCall('onNewNotification', data);
}
function onUpdateCount(data) {
requireAndCall('updateNotifCount', data);
}
function requireAndCall(method, param) {
require(['notifications'], function (notifications) {
notifications[method](param);