Node.js based forum software built for the modern web
fix: scroll chat/notification dropdowns to top when a new item arrives (#14776)
palmoni51c6363344cdc
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.jsindex 765a88c888..388cb2fbce 100644--- a/public/src/modules/chat.js+++ b/public/src/modules/chat.js@@ -106,8 +106,15 @@ define('chat', [const html = await app.parseAndTranslate('partials/chats/dropdown', { rooms: rooms });const listEl = chatsListEl.get(0);+ const prevFirstRoom = listEl.querySelector('[data-roomid]');+ const prevFirstRoomKey = prevFirstRoom && `${prevFirstRoom.getAttribute('data-roomid')}:${prevFirstRoom.classList.contains('unread')}`;chatsListEl.find('*').not('.navigation-link').remove();chatsListEl.prepend(html);+ const firstRoom = listEl.querySelector('[data-roomid]');+ const firstRoomKey = firstRoom && `${firstRoom.getAttribute('data-roomid')}:${firstRoom.classList.contains('unread')}`;+ if (prevFirstRoomKey && prevFirstRoomKey !== firstRoomKey) {+ listEl.scrollTop = 0;+ }chatsListEl.off('click').on('click', '[data-roomid]', function (ev) {if (['.user-link', '.mark-read'].some(className => ev.target.closest(className))) {return;diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.jsindex 74fb50a8ce..87fbb0a3f1 100644--- a/public/src/modules/notifications.js+++ b/public/src/modules/notifications.js@@ -47,7 +47,15 @@ define('notifications', [hooks.fire('filter:notifications.load', { notifications: notifs }).then(({ notifications }) => {app.parseAndTranslate('partials/notifications_list', { notifications }, function (html) {+ const listEl = notifList.get(0);+ const prevFirstNotif = listEl.querySelector('[data-nid]');+ const prevFirstNotifKey = prevFirstNotif && `${prevFirstNotif.getAttribute('data-nid')}:${prevFirstNotif.classList.contains('unread')}`;notifList.html(html);+ const firstNotif = listEl.querySelector('[data-nid]');+ const firstNotifKey = firstNotif && `${firstNotif.getAttribute('data-nid')}:${firstNotif.classList.contains('unread')}`;+ if (prevFirstNotifKey && prevFirstNotifKey !== firstNotifKey) {+ listEl.scrollTop = 0;+ }notifList.off('click').on('click', '[component="notifications/item/link"]', function (ev) {const notifEl = $(this).parents('[data-nid]');if (scrollToPostIndexIfOnPage(notifEl)) {