Node.js based forum software built for the modern web
feat: link chat reply quote timestamp to the quoted message (#14697)
palmoni590fc85da7aa2
diff --git a/public/src/client/chats.js b/public/src/client/chats.jsindex 234336173f..ac41bb8bf5 100644--- a/public/src/client/chats.js+++ b/public/src/client/chats.js@@ -79,12 +79,6 @@ define('forum/chats', [messages.toggleScrollUpAlert(chatContentEl);const scrollToEl = chatContentEl.find(`[data-index="${ajaxify.data.scrollToIndex - 1}"]`);messages.scrollToMessageAfterImageLoad(chatContentEl, scrollToEl);- if (scrollToEl) {- scrollToEl.addClass('highlight-pulse');- setTimeout(() => {- scrollToEl.removeClass('highlight-pulse');- }, 5000);- }} else {messages.scrollToBottomAfterImageLoad(chatContentEl);}@@ -203,6 +197,17 @@ define('forum/chats', [});};+ function gotoMessage(event, timestampEl) {+ const mid = timestampEl.parents('[data-parent-mid]').attr('data-parent-mid');+ const containerEl = timestampEl.parents('[component="chat/message/content"]');+ const messageEl = containerEl.find(`[component="chat/message"][data-mid="${mid}"]`);+ if (messageEl.length) {+ event.preventDefault();+ messages.scrollToMessage(messageEl);+ return false;+ }+ }+Chats.addParentHandler = function (mainWrapper) {mainWrapper.off('click', '[component="chat/message/parent"]').on('click', '[component="chat/message/parent"]', function () {@@ -215,6 +220,12 @@ define('forum/chats', [messages.scrollToBottom(chatContent);}});++ // deeper selector, so this runs before the collapse handler above+ mainWrapper.off('click', '[component="chat/message/parent"] .chat-timestamp')+ .on('click', '[component="chat/message/parent"] .chat-timestamp', function (ev) {+ return gotoMessage(ev, $(this));+ });};diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.jsindex e5e2133e94..0f9bb92124 100644--- a/public/src/client/chats/messages.js+++ b/public/src/client/chats/messages.js@@ -161,11 +161,21 @@ define('forum/chats/messages', [if (containerEl.length && msgEl.length) {const msgBodyEls = containerEl[0].querySelectorAll('[component="chat/message/body"]');imagesLoaded(msgBodyEls, () => {- msgEl[0].scrollIntoView(true);+ messages.scrollToMessage(msgEl);});}};+ messages.scrollToMessage = function (msgEl) {+ if (msgEl && msgEl.length) {+ msgEl[0].scrollIntoView(true);+ msgEl.addClass('highlight-pulse');+ setTimeout(() => {+ msgEl.removeClass('highlight-pulse');+ }, 5000);+ }+ };+messages.scrollToBottom = function (containerEl) {if (containerEl && containerEl.length) {containerEl.attr('data-ignore-next-scroll', 1);diff --git a/src/views/partials/chats/parent.tpl b/src/views/partials/chats/parent.tplindex cfd22d20a2..64192ee74b 100644--- a/src/views/partials/chats/parent.tpl+++ b/src/views/partials/chats/parent.tpl@@ -5,7 +5,7 @@<a href="{config.relative_path}/user/{messages.parent.user.userslug}" class="text-decoration-none lh-1">{{buildAvatar(messages.parent.user, "14px", true, "not-responsive align-middle")}}</a><a class="chat-user fw-semibold text-truncate" style="max-width: 150px;" href="{config.relative_path}/user/{messages.parent.user.userslug}">{{txDisplayname(messages.parent.user)}}</a></div>- <span class="chat-timestamp text-muted timeago text-nowrap hidden" title="{messages.parent.timestampISO}"></span>+ <a href="{config.relative_path}/message/{messages.parent.mid}" class="chat-timestamp text-muted timeago text-nowrap hidden" title="{messages.parent.timestampISO}"></a></div><div component="chat/message/parent/content" class="text-muted line-clamp-1 text-break w-100">{{{ if messages.parent.txContent }}}{{tx(messages.parent.content)}}{{{ else }}}{{messages.parent.content}}{{{ end }}}</div></div>