Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #3935

Browse Source
This commit is contained in:
Julian Lam
2015-12-14 14:20:52 -05:00
parent a4d8ab9d12
commit 7b49dc9061
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/chats.js
View File

@@ -189,7 +189,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
}; };
Chats.switchChat = function(uid, username) { Chats.switchChat = function(uid, username) {
if (!$('[component="chat/messages"]').length) { if (!$('#content [component="chat/messages"]').length) {
return ajaxify.go('chats/' + utils.slugify(username)); return ajaxify.go('chats/' + utils.slugify(username));
} }

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

@@ -19,10 +19,6 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
}); });
socket.on('event:chats.receive', function(data) { socket.on('event:chats.receive', function(data) {
if (ajaxify.currentPage.match(/^chats/)) {
return;
}
var username = data.message.fromUser.username; var username = data.message.fromUser.username;
var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.user.uid, 10); var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.user.uid, 10);
data.message.self = data.self; data.message.self = data.self;