From 8ddf7eb922f0174f481f3f0a80a530bd5880ca3d Mon Sep 17 00:00:00 2001 From: Anil Mandepudi Date: Thu, 29 Dec 2016 11:25:05 -0800 Subject: [PATCH] Use scrollStop in chat (#5326) --- public/src/modules/chat.js | 7 +++++-- public/src/modules/scrollStop.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index d90dc210d4..f231fd765d 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -8,8 +8,9 @@ define('chat', [ 'sounds', 'forum/chats', 'forum/chats/messages', - 'translator' -], function (components, taskbar, S, sounds, Chats, ChatsMessages, translator) { + 'translator', + 'scrollStop' +], function (components, taskbar, S, sounds, Chats, ChatsMessages, translator, scrollStop) { var module = {}; var newMessage = false; @@ -196,6 +197,8 @@ define('chat', [ handle: '.modal-header' }); }); + + scrollStop.apply(chatModal.find('[component="chat/messages"]')); chatModal.find('#chat-close-btn').on('click', function () { module.close(chatModal); diff --git a/public/src/modules/scrollStop.js b/public/src/modules/scrollStop.js index 3bb96aed8b..13d722402c 100644 --- a/public/src/modules/scrollStop.js +++ b/public/src/modules/scrollStop.js @@ -21,7 +21,7 @@ define('scrollStop', function () { if ( (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; }