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

refactored sound system so that they can be specified in ACP, updated soundfile to work in FF, which fixes #1209

Browse Source
This commit is contained in:
Julian Lam
2014-03-13 17:15:07 -04:00
parent 175230e337
commit 553cabdcfa
10 changed files with 143 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,7 @@
'use strict';
"use strict";
/* globals app, config, define, socket, translator, templates, utils */
define(['taskbar', 'string', 'sound'], function(taskbar, S, sound) {
define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
var module = {};
@@ -53,9 +52,8 @@ define(['taskbar', 'string', 'sound'], function(taskbar, S, sound) {
});
socket.on('event:chats.receive', function(data) {
if (module.modalExists(data.fromuid)) {
var modal = module.getModal(data.fromuid);
if (module.modalExists(data.uid)) {
var modal = module.getModal(data.uid);
module.appendChatMessage(modal, data.message, data.timestamp);
if (modal.is(":visible")) {
@@ -71,13 +69,15 @@ define(['taskbar', 'string', 'sound'], function(taskbar, S, sound) {
app.alternatingTitle(data.username + ' has messaged you');
}
} else {
module.createModal(data.username, data.fromuid, function(modal) {
module.createModal(data.username, data.uid, function(modal) {
module.toggleNew(modal.attr('UUID'), true);
app.alternatingTitle(data.username + ' has messaged you');
});
}
sound.play('chat-incoming');
if (parseInt(app.uid, 10) !== parseInt(data.fromUid, 10)) {
sounds.play('chat-incoming');
}
});
};
@@ -229,7 +229,8 @@ define(['taskbar', 'string', 'sound'], function(taskbar, S, sound) {
msg = msg +'\n';
socket.emit('modules.chats.send', { touid:chatModal.touid, message:msg});
chatModal.find('#chat-message-input').val('');
sound.play('chat-outgoing');
console.log('outgoing');
sounds.play('chat-outgoing');
}
}