From 2ad2ef96ba6345d660041d5e55736fb4cd51260b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 11 Jan 2018 15:26:46 -0500 Subject: [PATCH] no taskbar invocation on chats page, fixes #6227 --- public/src/modules/chat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index fadd1d6f82..9c25ad07a0 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -61,7 +61,7 @@ define('chat', [ if (modal.is(':visible')) { taskbar.updateActive(modal.attr('UUID')); ChatsMessages.scrollToBottom(modal.find('.chat-content')); - } else { + } else if (!ajaxify.data.template.chats) { module.toggleNew(modal.attr('UUID'), true, true); } @@ -75,7 +75,7 @@ define('chat', [ roomId: data.roomId, }); } - } else { + } else if (!ajaxify.data.template.chats) { socket.emit('modules.chats.loadRoom', { roomId: data.roomId, }, function (err, roomData) {