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

closes #2530

Browse Source
This commit is contained in:
barisusakli
2014-12-21 00:08:01 -05:00
parent 712d5bce5b
commit 3bdb98e747
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/app.js
View File

@@ -291,6 +291,7 @@ app.uid = null;
function loadAndCenter(chatModal) { function loadAndCenter(chatModal) {
chat.load(chatModal.attr('UUID')); chat.load(chatModal.attr('UUID'));
chat.center(chatModal); chat.center(chatModal);
chat.focusInput(chatModal);
} }
if (!chat.modalExists(touid)) { if (!chat.modalExists(touid)) {

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

@@ -293,6 +293,10 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
}); });
}; };
module.focusInput = function(chatModal) {
chatModal.find('#chat-message-input').focus();
};
module.close = function(chatModal) { module.close = function(chatModal) {
clearInterval(chatModal.attr('intervalId')); clearInterval(chatModal.attr('intervalId'));
chatModal.attr('intervalId', 0); chatModal.attr('intervalId', 0);
@@ -310,7 +314,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
} }
chatModal.css('left', Math.max(0, (($(window).width() - $(chatModal).outerWidth()) / 2) + $(window).scrollLeft()) + 'px'); 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.css('top', Math.max(0, $(window).height() / 2 - $(chatModal).outerHeight() / 2) + 'px');
chatModal.find('#chat-message-input').focus();
if (hideAfter) { if (hideAfter) {
chatModal.addClass('hide'); chatModal.addClass('hide');
} }
@@ -324,6 +328,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
taskbar.updateActive(uuid); taskbar.updateActive(uuid);
Chats.scrollToBottom(chatModal.find('#chat-content')); Chats.scrollToBottom(chatModal.find('#chat-content'));
module.bringModalToTop(chatModal); module.bringModalToTop(chatModal);
module.focusInput(chatModal);
socket.emit('modules.chats.markRead', chatModal.attr('touid')); socket.emit('modules.chats.markRead', chatModal.attr('touid'));
}; };