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

more WIP

Browse Source
This commit is contained in:
Julian Lam
2014-07-07 12:26:17 -04:00
parent 1db96dc627
commit 07a82ec12c
3 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
"use strict";
/* globals app, config, define, socket, translator, templates, utils */
define('chat', ['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, S, sounds, Chats) {
var module = {};
@@ -231,7 +231,7 @@ define('chat', ['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
chatModal.remove();
chatModal.data('modal', null);
taskbar.discard('chat', chatModal.attr('UUID'));
notifyStopTyping(chatModal.touid);
Chats.notifyTyping(chatModal.touid, false);
};
module.center = function(chatModal) {
@@ -258,13 +258,9 @@ define('chat', ['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
taskbar.minimize('chat', uuid);
clearInterval(chatModal.intervalId);
chatModal.intervalId = 0;
notifyStopTyping(chatModal.touid);
Chats.notifyTyping(chatModal.touid, false);
};
function notifyStopTyping(touid) {
socket.emit('modules.chats.userStopTyping', {touid:touid, fromUid: app.uid});
}
function getChatMessages(chatModal, callback) {
socket.emit('modules.chats.get', {touid:chatModal.touid}, function(err, messages) {
for(var i = 0; i<messages.length; ++i) {
@@ -278,7 +274,7 @@ define('chat', ['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
var input = chatModal.find('#chat-message-input');
input.off('keypress').on('keypress', function(e) {
if(e.which === 13) {
sendMessage(chatModal);
Chats.sendMessage(chatModal.touid, chatModal.find('#chat-message-input'));
}
});
@@ -286,27 +282,16 @@ define('chat', ['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
if ($(this).val()) {
socket.emit('modules.chats.userStartTyping', {touid:chatModal.touid, fromUid: app.uid});
} else {
notifyStopTyping(chatModal.touid);
Chats.notifyTyping(chatModal.touid, false);
}
});
chatModal.find('#chat-message-send-btn').off('click').on('click', function(e){
sendMessage(chatModal);
Chats.sendMessage(chatModal.touid, chatModal.find('#chat-message-input'));
return false;
});
}
function sendMessage(chatModal) {
var msg = S(chatModal.find('#chat-message-input').val()).stripTags().s;
if (msg.length) {
msg = msg +'\n';
socket.emit('modules.chats.send', {touid:chatModal.touid, message:msg});
chatModal.find('#chat-message-input').val('');
sounds.play('chat-outgoing');
notifyStopTyping(chatModal.touid);
}
}
module.appendChatMessage = function(chatModal, data) {
var chatContent = chatModal.find('#chat-content');