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 #2346

Browse Source
This commit is contained in:
barisusakli
2014-11-04 16:49:02 -05:00
parent e769ebe668
commit 38874345b7
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,8 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
});
socket.on('event:user_status_change', function(data) {
updateStatus(data.status);
var modal = module.getModal(data.uid);
updateStatus(modal, data.status);
});
};
@@ -148,13 +149,13 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
if (err) {
return app.alertError(err.message);
}
updateStatus(status);
updateStatus(chatModal, status);
});
}
function updateStatus(status) {
function updateStatus(chatModal, status) {
translator.translate('[[global:' + status + ']]', function(translated) {
$('#chat-user-status').attr('class', 'fa fa-circle status ' + status)
chatModal.find('#chat-user-status').attr('class', 'fa fa-circle status ' + status)
.attr('title', translated)
.attr('data-original-title', translated);
});
@@ -175,6 +176,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
chatModal.css('position', 'fixed');
chatModal.css('zIndex', 100);
chatModal.appendTo($('body'));
module.center(chatModal);
chatModal.draggable({
start:function() {
module.bringModalToTop(chatModal);
@@ -268,9 +270,17 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
};
module.center = function(chatModal) {
chatModal.css("left", Math.max(0, (($(window).width() - $(chatModal).outerWidth()) / 2) + $(window).scrollLeft()) + "px");
chatModal.css("top", Math.max(0, $(window).height() / 2 - $(chatModal).outerHeight() / 2) + "px");
var hideAfter = false;
if (chatModal.hasClass('hide')) {
chatModal.removeClass('hide');
hideAfter = true;
}
chatModal.css('left', Math.max(0, (($(window).width() - $(chatModal).outerWidth()) / 2) + $(window).scrollLeft()) + 'px');
chatModal.css('top', Math.max(0, $(window).height() / 2 - $(chatModal).outerHeight() / 2) + 'px');
chatModal.find('#chat-message-input').focus();
if (hideAfter) {
chatModal.addClass('hide');
}
return chatModal;
};
@@ -280,7 +290,6 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
checkStatus(chatModal);
taskbar.updateActive(uuid);
Chats.scrollToBottom(chatModal.find('#chat-content'));
module.center(chatModal);
module.bringModalToTop(chatModal);
socket.emit('modules.chats.markRead', chatModal.attr('touid'));
};