This commit is contained in:
barisusakli
2014-09-17 16:29:03 -04:00
parent cd135dda13
commit 4066607388
7 changed files with 64 additions and 17 deletions

View File

@@ -193,9 +193,10 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
var totalHeight = chatModal.find('.modal-content').outerHeight() - chatModal.find('.modal-header').outerHeight();
var padding = parseInt(chatModal.find('.modal-body').css('padding-top'), 10) + parseInt(chatModal.find('.modal-body').css('padding-bottom'), 10);
var contentMargin = parseInt(chatModal.find('#chat-content').css('margin-top'), 10) + parseInt(chatModal.find('#chat-content').css('margin-bottom'), 10);
var sinceHeight = chatModal.find('.since-bar').outerHeight(true);
var inputGroupHeight = chatModal.find('.input-group').outerHeight();
chatModal.find('#chat-content').css('height', totalHeight - padding - contentMargin - inputGroupHeight);
chatModal.find('#chat-content').css('height', totalHeight - padding - contentMargin - sinceHeight - inputGroupHeight);
});
chatModal.find('#chat-with-name').html(username);
@@ -220,6 +221,14 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
}
});
chatModal.find('[data-since]').on('click', function() {
var since = $(this).attr('data-since');
chatModal.find('[data-since]').removeClass('selected');
$(this).addClass('selected');
loadChatSince(chatModal, since);
return false;
});
addSendHandler(chatModal);
getChatMessages(chatModal, function() {
@@ -279,7 +288,15 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
};
function getChatMessages(chatModal, callback) {
socket.emit('modules.chats.get', {touid: chatModal.attr('touid')}, function(err, messages) {
socket.emit('modules.chats.get', {touid: chatModal.attr('touid'), since: 'day'}, function(err, messages) {
module.appendChatMessage(chatModal, messages, callback);
});
}
function loadChatSince(chatModal, since, callback) {
socket.emit('modules.chats.get', {touid: chatModal.attr('touid'), since: since}, function(err, messages) {
var chatContent = chatModal.find('#chat-content');
chatContent.find('.chat-message').remove();
module.appendChatMessage(chatModal, messages, callback);
});
}