diff --git a/install/package.json b/install/package.json index 51e9f5a6e3..b37802df00 100644 --- a/install/package.json +++ b/install/package.json @@ -101,10 +101,10 @@ "nodebb-plugin-ntfy": "1.2.5", "nodebb-plugin-spam-be-gone": "2.1.1", "nodebb-rewards-essentials": "0.2.3", - "nodebb-theme-harmony": "1.1.28", + "nodebb-theme-harmony": "1.1.29", "nodebb-theme-lavender": "7.1.3", - "nodebb-theme-peace": "2.1.9", - "nodebb-theme-persona": "13.2.14", + "nodebb-theme-peace": "2.1.10", + "nodebb-theme-persona": "13.2.15", "nodebb-widget-essentials": "7.0.13", "nodemailer": "6.9.4", "nprogress": "0.2.0", diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js index 3f961f8865..864b6e0604 100644 --- a/public/src/client/chats/messages.js +++ b/public/src/client/chats/messages.js @@ -263,16 +263,19 @@ define('forum/chats/messages', [ const self = parseInt(message.fromuid, 10) === parseInt(app.user.uid, 10); message.self = self ? 1 : 0; messages.parseMessage(message, function (html) { + const msgEl = components.get('chat/message', message.mid); + if (msgEl.length) { + msgEl.replaceWith(html); + messages.onMessagesAddedToDom(components.get('chat/message', message.mid)); + } const parentEl = $(`[component="chat/message/parent"][data-parent-mid="${message.mid}"]`); if (parentEl.length) { parentEl.find('[component="chat/message/parent/content"]').html( html.find('[component="chat/message/body"]').html() ); - } - const msgEl = components.get('chat/message', message.mid); - if (msgEl.length) { - msgEl.replaceWith(html); - messages.onMessagesAddedToDom(components.get('chat/message', message.mid)); + messages.onMessagesAddedToDom( + $(`[component="chat/message/parent"][data-parent-mid="${message.mid}"]`) + ); } }); }); @@ -302,15 +305,17 @@ define('forum/chats/messages', [ const isParentSelf = parseInt(parentEl.attr('data-uid'), 10) === app.user.uid; msgEl.toggleClass('deleted', false); parentEl.toggleClass('deleted', false); - if (!isParentSelf) { - parentEl.find('[component="chat/message/parent/content"]') - .translateHtml(message.content); - } if (!isSelf) { msgEl.find('[component="chat/message/body"]') .translateHtml(message.content); messages.onMessagesAddedToDom(components.get('chat/message', message.messageId)); } + + if (!isParentSelf && parentEl.length) { + parentEl.find('[component="chat/message/parent/content"]') + .translateHtml(message.content); + messages.onMessagesAddedToDom($(`[component="chat/message/parent"][data-parent-mid="${message.messageId}"]`)); + } } messages.delete = function (messageId, roomId) {