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

Fix newSet detection on chat messages

Browse Source
This commit is contained in:
Julian Lam
2015-07-29 13:16:52 -04:00
parent 8b5195fa82
commit 98b74f848e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,11 +136,13 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
Chats.addSocketListeners = function() { Chats.addSocketListeners = function() {
socket.on('event:chats.receive', function(data) { socket.on('event:chats.receive', function(data) {
var typingNotifEl = $('.user-typing'), var typingNotifEl = $('.user-typing'),
containerEl = $('.expanded-chat ul'); containerEl = $('.expanded-chat ul'),
lastSpeaker = parseInt(containerEl.find('.chat-message').last().attr('data-uid'), 10);
if (Chats.isCurrentChat(data.withUid)) { if (Chats.isCurrentChat(data.withUid)) {
newMessage = data.self === 0; newMessage = data.self === 0;
data.message.self = data.self; data.message.self = data.self;
data.message.newSet = lastSpeaker !== data.message.fromuid;
Chats.parseMessage(data.message, onMessagesParsed); Chats.parseMessage(data.message, onMessagesParsed);
} else { } else {
$('.chats-list li[data-uid="' + data.withUid + '"]').addClass('unread'); $('.chats-list li[data-uid="' + data.withUid + '"]').addClass('unread');

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

@@ -457,7 +457,10 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
} }
module.appendChatMessage = function(chatModal, data, done) { module.appendChatMessage = function(chatModal, data, done) {
var chatContent = chatModal.find('.chat-content'); var chatContent = chatModal.find('.chat-content'),
lastSpeaker = parseInt(chatContent.find('.chat-message').last().attr('data-uid'), 10);
data.newSet = lastSpeaker !== data.fromuid;
Chats.parseMessage(data, function(html) { Chats.parseMessage(data, function(html) {
var message = $(html); var message = $(html);