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

closes #1504

Browse Source
This commit is contained in:
barisusakli
2014-05-09 17:46:10 -04:00
parent 274acc8eec
commit 4c28de659c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,8 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
socket.on('event:chats.receive', function(data) {
var username = data.message.fromUser.username;
if(parseInt(data.message.fromUser.uid, 10) === parseInt(app.uid, 10)) {
var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.uid, 10);
if (isSelf) {
username = data.message.toUser.username;
}
@@ -70,17 +71,19 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
module.toggleNew(modal.attr('UUID'), true);
}
if (!modal.is(":visible") || !app.isFocused) {
if (!isSelf && (!modal.is(":visible") || !app.isFocused)) {
app.alternatingTitle(username + ' has messaged you');
}
} else {
module.createModal(username, data.withUid, function(modal) {
module.toggleNew(modal.attr('UUID'), true);
app.alternatingTitle(username + ' has messaged you');
if (!isSelf) {
app.alternatingTitle(username + ' has messaged you');
}
});
}
if (parseInt(app.uid, 10) !== parseInt(data.message.fromuid, 10)) {
if (!isSelf) {
sounds.play('chat-incoming');
}
});