Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1471

Browse Source
This commit is contained in:
barisusakli
2014-05-02 16:02:22 -04:00
parent 681d9c95ab
commit f3d0d70867
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,10 +88,12 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
socket.on('event:chats.userStartTyping', function(withUid) { socket.on('event:chats.userStartTyping', function(withUid) {
var modal = module.getModal(withUid); var modal = module.getModal(withUid);
var chatContent = modal.find('#chat-content'); var chatContent = modal.find('#chat-content');
modal.find('.user-typing') var atBottom = chatContent[0].scrollHeight - chatContent.scrollTop() === chatContent.innerHeight();
.removeClass('hide')
.appendTo(chatContent); modal.find('.user-typing').removeClass('hide').appendTo(chatContent);
scrollToBottom(chatContent); if (atBottom) {
scrollToBottom(chatContent);
}
}); });
socket.on('event:chats.userStopTyping', function(withUid) { socket.on('event:chats.userStopTyping', function(withUid) {
@@ -181,7 +183,7 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
}); });
translator.translate('[[modules:chat.user_typing, ' + username + ']]', function(translated) { translator.translate('[[modules:chat.user_typing, ' + username + ']]', function(translated) {
chatModal.find('.user-typing').text(translated); chatModal.find('.user-typing .text').text(translated);
}); });
@@ -286,7 +288,7 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
var time = '<span class="chat-timestamp pull-right timeago" title="' + utils.toISOString(data.timestamp) + '"></span> '; var time = '<span class="chat-timestamp pull-right timeago" title="' + utils.toISOString(data.timestamp) + '"></span> ';
if (data.fromuid !== chatContent.children().last().attr('data-uid')) { if (data.fromuid !== chatContent.children('.chat-message').last().attr('data-uid')) {
var userPicture = $('<a href="/user/' + data.fromUser.userslug + '"><img class="chat-user-image" src="' + data.fromUser.picture + '"></a>'); var userPicture = $('<a href="/user/' + data.fromUser.userslug + '"><img class="chat-user-image" src="' + data.fromUser.picture + '"></a>');
var userName = $('<strong><span class="chat-user"> '+ data.fromUser.username + '</span></strong>'); var userName = $('<strong><span class="chat-user"> '+ data.fromUser.username + '</span></strong>');
userName.toggleClass('chat-user-you', isYou); userName.toggleClass('chat-user-you', isYou);