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 #1825, closes #1674

Browse Source
This commit is contained in:
barisusakli
2014-07-19 10:33:27 -04:00
parent a69973e7a7
commit a4975cab33
6 changed files with 121 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@
define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, S, sounds, Chats) {
var module = {};
var newMessage = false;
module.prepareDOM = function() {
// Chats Dropdown
@@ -66,7 +67,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
if (isSelf) {
username = data.message.toUser.username;
}
newMessage = data.message.self === 0;
if (module.modalExists(data.withUid)) {
var modal = module.getModal(data.withUid);
module.appendChatMessage(modal, data.message);
@@ -135,7 +136,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
};
function checkStatus(chatModal) {
socket.emit('user.isOnline', chatModal.touid, function(err, data) {
socket.emit('user.isOnline', chatModal.attr('touid'), function(err, data) {
translator.translate('[[global:' + data.status + ']]', function(translated) {
$('#chat-user-status').attr('class', 'fa fa-circle status ' + data.status)
.attr('title', translated)
@@ -145,10 +146,10 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
}
function checkOnlineStatus(chatModal) {
if(chatModal.intervalId === 0) {
chatModal.intervalId = setInterval(function() {
if(parseInt(chatModal.attr('intervalId'), 10) === 0) {
chatModal.attr('intervalId', setInterval(function() {
checkStatus(chatModal);
}, 1000);
}, 1000));
}
}
@@ -160,11 +161,9 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
var chatModal = $(chatTpl),
uuid = utils.generateUUID();
chatModal.intervalId = 0;
chatModal.touid = touid;
chatModal.username = username;
chatModal.attr('id', 'chat-modal-' + touid);
chatModal.attr('touid', touid);
chatModal.attr('intervalId', 0);
chatModal.attr('UUID', uuid);
chatModal.css("position", "fixed");
chatModal.appendTo($('body'));
@@ -211,6 +210,13 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
module.bringModalToTop(chatModal);
});
chatModal.on('mousemove keypress click', function() {
if (newMessage) {
socket.emit('modules.chats.markRead', touid);
console.log('sent')
newMessage = false;
}
});
addSendHandler(chatModal);
@@ -234,12 +240,12 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
};
module.close = function(chatModal) {
clearInterval(chatModal.intervalId);
chatModal.intervalId = 0;
clearInterval(chatModal.attr('intervalId'));
chatModal.attr('intervalId', 0);
chatModal.remove();
chatModal.data('modal', null);
taskbar.discard('chat', chatModal.attr('UUID'));
Chats.notifyTyping(chatModal.touid, false);
Chats.notifyTyping(chatModal.attr('touid'), false);
};
module.center = function(chatModal) {
@@ -258,19 +264,20 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
Chats.scrollToBottom(chatModal.find('#chat-content'));
module.center(chatModal);
module.bringModalToTop(chatModal);
socket.emit('modules.chats.markRead', chatModal.attr('touid'));
};
module.minimize = function(uuid) {
var chatModal = $('div[UUID="' + uuid + '"]');
chatModal.addClass('hide');
taskbar.minimize('chat', uuid);
clearInterval(chatModal.intervalId);
chatModal.intervalId = 0;
Chats.notifyTyping(chatModal.touid, false);
clearInterval(chatModal.attr('intervalId'));
chatModal.attr('intervalId', 0);
Chats.notifyTyping(chatModal.attr('touid'), false);
};
function getChatMessages(chatModal, callback) {
socket.emit('modules.chats.get', {touid:chatModal.touid}, function(err, messages) {
socket.emit('modules.chats.get', {touid: chatModal.attr('touid')}, function(err, messages) {
module.appendChatMessage(chatModal, messages, callback);
});
}
@@ -279,20 +286,20 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
var input = chatModal.find('#chat-message-input');
input.off('keypress').on('keypress', function(e) {
if(e.which === 13) {
Chats.sendMessage(chatModal.touid, chatModal.find('#chat-message-input'));
Chats.sendMessage(chatModal.attr('touid'), chatModal.find('#chat-message-input'));
}
});
input.off('keyup').on('keyup', function() {
if ($(this).val()) {
socket.emit('modules.chats.userStartTyping', {touid:chatModal.touid, fromUid: app.uid});
socket.emit('modules.chats.userStartTyping', {touid:chatModal.attr('touid'), fromUid: app.uid});
} else {
Chats.notifyTyping(chatModal.touid, false);
Chats.notifyTyping(chatModal.attr('touid'), false);
}
});
chatModal.find('#chat-message-send-btn').off('click').on('click', function(e){
Chats.sendMessage(chatModal.touid, chatModal.find('#chat-message-input'));
Chats.sendMessage(chatModal.attr('touid'), chatModal.find('#chat-message-input'));
return false;
});
}
@@ -308,7 +315,9 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
message.insertBefore(typingNotif);
Chats.scrollToBottom(chatContent);
if (typeof done === 'function') done();
if (typeof done === 'function') {
done();
}
});
};