Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-06 00:07:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-09-06 15:32:04 -04:00
parent 0849e4d904 e4ecb96f1a
commit 60438b9998
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/chats.js
View File

@@ -389,7 +389,7 @@ define('forum/chats', [
return;
}
const lastMid = message.attr('data-mid');
messages.prepEdit(inputEl, lastMid, ajaxify.data.roomId);
messages.prepEdit(message, lastMid, ajaxify.data.roomId);
}
});
};

3
public/src/client/chats/messages.js
View File

@@ -198,6 +198,7 @@ define('forum/chats/messages', [
const messageControls = msgEl.find(`[component="chat/message/controls"]`);
const chatContent = messageBody.parents('[component="chat/message/content"]');
const isAtBottom = messages.isAtBottom(chatContent);
messageBody.addClass('hidden');
messageControls.addClass('hidden');
editEl.insertAfter(messageBody);
@@ -207,7 +208,7 @@ define('forum/chats/messages', [
textarea.focus().putCursorAtEnd();
autoresizeTextArea(textarea);
if (chatContent.length && messages.isAtBottom(chatContent)) {
if (chatContent.length && isAtBottom) {
messages.scrollToBottom(chatContent);
}