diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 5791a7828f..7dc3015c05 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -18,6 +18,7 @@ define('chat', [ module.prepareDOM = function () { var chatsToggleEl = components.get('chat/dropdown'); var chatsListEl = components.get('chat/list'); + var chatsDropdownWrapper = chatsToggleEl.parents('.dropdown'); chatsToggleEl.on('click', function () { if (chatsToggleEl.parent().hasClass('open')) { @@ -27,6 +28,10 @@ define('chat', [ module.loadChatsDropdown(chatsListEl); }); + if (chatsDropdownWrapper.hasClass('open')) { + module.loadChatsDropdown(chatsListEl); + } + chatsListEl.on('click', '[data-roomid]', function (ev) { if ($(ev.target).parents('.user-link').length) { return; diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 92574f3eb1..937f625738 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -10,6 +10,7 @@ define('notifications', ['sounds', 'translator', 'components', 'navigator', 'ben var notifContainer = components.get('notifications'); var notifTrigger = notifContainer.children('a'); var notifList = components.get('notifications/list'); + var notifDropdownWrapper = notifTrigger.parents('.dropdown'); notifTrigger.on('click', function (e) { e.preventDefault(); @@ -20,6 +21,10 @@ define('notifications', ['sounds', 'translator', 'components', 'navigator', 'ben Notifications.loadNotifications(notifList); }); + if (notifDropdownWrapper.hasClass('open')) { + Notifications.loadNotifications(notifList); + } + notifList.on('click', '[data-nid]', function (ev) { var notifEl = $(this); if (scrollToPostIndexIfOnPage(notifEl)) {