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

chat fix

Browse Source
This commit is contained in:
barisusakli
2014-09-02 16:01:45 -04:00
parent e495db3065
commit 6b39e328f5
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ define('forum/chats', ['string', 'sounds'], function(S, sounds) {
if (Chats.isCurrentChat(data.withUid)) { if (Chats.isCurrentChat(data.withUid)) {
newMessage = data.self === 0; newMessage = data.self === 0;
data.message.self = data.self;
Chats.parseMessage(data.message, function(html) { Chats.parseMessage(data.message, function(html) {
var newMessage = $(html); var newMessage = $(html);
newMessage.insertBefore(typingNotifEl); newMessage.insertBefore(typingNotifEl);

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

@@ -63,6 +63,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
var username = data.message.fromUser.username; var username = data.message.fromUser.username;
var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.uid, 10); var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.uid, 10);
data.message.self = data.self;
if (isSelf) { if (isSelf) {
username = data.message.toUser.username; username = data.message.toUser.username;
} }

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

@@ -207,7 +207,7 @@ SocketModules.chats.send = function(socket, data, callback) {
server.getUserSockets(touid).forEach(function(s) { server.getUserSockets(touid).forEach(function(s) {
s.emit('event:chats.receive', { s.emit('event:chats.receive', {
withUid: socket.uid, withUid: socket.uid,
message: recipMessage, message: message,
self: 0 self: 0
}); });
}); });