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

highlighting of the user with whom you are currently chatting with #1788

Browse Source
This commit is contained in:
Julian Lam
2014-07-07 13:09:09 -04:00
parent 07a82ec12c
commit a031bc2721
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/src/app.js
View File

@@ -156,13 +156,13 @@ var socket,
app.enterRoom('global'); app.enterRoom('global');
if (config.environment === 'development' && console && console.log) { // if (config.environment === 'development' && console && console.log) {
var log = console.log; // var log = console.log;
console.log = function() { // console.log = function() {
log.apply(this, arguments); // log.apply(this, arguments);
socket.emit('tools.log', arguments); // socket.emit('tools.log', arguments);
}; // };
} // }
app.cacheBuster = config['cache-buster']; app.cacheBuster = config['cache-buster'];

23
public/src/forum/chats.js
View File

@@ -1,16 +1,21 @@
'use strict'; 'use strict';
/* globals define, app*/ /* globals define, app, ajaxify, utils, socket */
define('forum/chats', ['string','sounds'], function(S, sounds) { define('forum/chats', ['string', 'sounds'], function(S, sounds) {
var Chats = {}; var Chats = {};
Chats.init = function() { Chats.init = function() {
var containerEl = $('.expanded-chat ul');
Chats.addEventListeners(); Chats.addEventListeners();
Chats.addSocketListeners(); Chats.addSocketListeners();
Chats.scrollToBottom(containerEl);
Chats.setActive();
}; };
Chats.getRecipientUid = function() { Chats.getRecipientUid = function() {
console.log($('.expanded-chat'));
return parseInt($('.expanded-chat').attr('data-uid'), 10); return parseInt($('.expanded-chat').attr('data-uid'), 10);
}; };
@@ -93,5 +98,19 @@ define('forum/chats', ['string','sounds'], function(S, sounds) {
} }
}; };
Chats.scrollToBottom = function(containerEl) {
if (containerEl.length) {
containerEl.scrollTop(
containerEl[0].scrollHeight - containerEl.height()
);
}
};
Chats.setActive = function() {
console.log(Chats.getRecipientUid());
$('.chats-list li').removeClass('bg-primary');
$('.chats-list li[data-uid="' + Chats.getRecipientUid() + '"]').addClass('bg-primary');
};
return Chats; return Chats;
}); });

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

@@ -71,7 +71,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
module.bringModalToTop(modal); module.bringModalToTop(modal);
checkOnlineStatus(modal); checkOnlineStatus(modal);
taskbar.updateActive(modal.attr('UUID')); taskbar.updateActive(modal.attr('UUID'));
scrollToBottom(modal.find('#chat-content')); Chats.scrollToBottom(modal.find('#chat-content'));
} else { } else {
module.toggleNew(modal.attr('UUID'), true); module.toggleNew(modal.attr('UUID'), true);
} }
@@ -103,7 +103,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
modal.find('.user-typing').removeClass('hide').appendTo(chatContent); modal.find('.user-typing').removeClass('hide').appendTo(chatContent);
if (atBottom) { if (atBottom) {
scrollToBottom(chatContent); Chats.scrollToBottom(chatContent);
} }
}); });
@@ -247,7 +247,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
chatModal.removeClass('hide'); chatModal.removeClass('hide');
checkOnlineStatus(chatModal); checkOnlineStatus(chatModal);
taskbar.updateActive(uuid); taskbar.updateActive(uuid);
scrollToBottom(chatModal.find('#chat-content')); Chats.scrollToBottom(chatModal.find('#chat-content'));
module.center(chatModal); module.center(chatModal);
module.bringModalToTop(chatModal); module.bringModalToTop(chatModal);
}; };
@@ -320,17 +320,9 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
chatContent.append(message); chatContent.append(message);
scrollToBottom(chatContent); Chats.scrollToBottom(chatContent);
}; };
function scrollToBottom(chatContent) {
if(chatContent[0]) {
chatContent.scrollTop(
chatContent[0].scrollHeight - chatContent.height()
);
}
}
module.toggleNew = function(uuid, state) { module.toggleNew = function(uuid, state) {
taskbar.toggleNew(uuid, state); taskbar.toggleNew(uuid, state);
}; };