Use scrollStop in chat (#5326)

v1.18.x
Anil Mandepudi 8 years ago committed by Julian Lam
parent 8df47f333e
commit 8ddf7eb922

@ -8,8 +8,9 @@ define('chat', [
'sounds', 'sounds',
'forum/chats', 'forum/chats',
'forum/chats/messages', 'forum/chats/messages',
'translator' 'translator',
], function (components, taskbar, S, sounds, Chats, ChatsMessages, translator) { 'scrollStop'
], function (components, taskbar, S, sounds, Chats, ChatsMessages, translator, scrollStop) {
var module = {}; var module = {};
var newMessage = false; var newMessage = false;
@ -196,6 +197,8 @@ define('chat', [
handle: '.modal-header' handle: '.modal-header'
}); });
}); });
scrollStop.apply(chatModal.find('[component="chat/messages"]'));
chatModal.find('#chat-close-btn').on('click', function () { chatModal.find('#chat-close-btn').on('click', function () {
module.close(chatModal); module.close(chatModal);

@ -21,7 +21,7 @@ define('scrollStop', function () {
if ( if (
(e.originalEvent.deltaY < 0 && scrollTop === 0) || // scroll up (e.originalEvent.deltaY < 0 && scrollTop === 0) || // scroll up
(e.originalEvent.deltaY > 0 && (elementHeight + scrollTop) > scrollHeight) // scroll down (e.originalEvent.deltaY > 0 && (elementHeight + scrollTop) >= scrollHeight) // scroll down
) { ) {
return false; return false;
} }

Loading…
Cancel
Save