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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-23 12:32:03 -05:00
parent 62e0f5f883 d4c2fc3bc8
commit 672d7352bb
51 changed files with 1297 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ define('chat', [
if (!isSelf && (!modal.is(':visible') || !app.isFocused)) {
app.alternatingTitle('[[modules:chat.user_has_messaged_you, ' + username + ']]');
sounds.play('chat-incoming');
sounds.play('chat-incoming', 'chat.incoming:' + data.message.mid);
taskbar.push('chat', modal.attr('UUID'), {
title: data.roomName || username,
@@ -89,7 +89,7 @@ define('chat', [
module.toggleNew(modal.attr('UUID'), !isSelf, true);
if (!isSelf) {
app.alternatingTitle('[[modules:chat.user_has_messaged_you, ' + username + ']]');
sounds.play('chat-incoming');
sounds.play('chat-incoming', 'chat.incoming:' + data.message.mid);
}
});
});