From c6d9cbb7d2cba3827a51be2bf9f938a5ce5813f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 3 Feb 2023 22:05:06 -0500
Subject: [PATCH] refactor: IS scrolltop

---
 public/src/client/topic/posts.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index 0f315a79f3..dfb2aa09df 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -14,6 +14,7 @@ define('forum/topic/posts', [
 	const Posts = { };
 
 	Posts.signaturesShown = {};
+	const $window = $(window);
 
 	Posts.onNewPost = function (data) {
 		if (
@@ -214,28 +215,27 @@ define('forum/topic/posts', [
 				return !isPost || index === -1 || (pid && $('[component="post"][data-pid="' + pid + '"]').length === 0);
 			});
 
+			const removedEls = infinitescroll.removeExtra($('[component="post"]'), direction, Math.max(20, config.postsPerPage * 2));
+
 			if (after) {
 				html.insertAfter(after);
 			} else if (before) {
 				// Save document height and position for future reference (about 5 lines down)
 				const height = $(document).height();
-				const scrollTop = $(window).scrollTop();
+				const scrollTop = $window.scrollTop();
 
 				html.insertBefore(before);
 
 				// Now restore the relative position the user was on prior to new post insertion
 				if (userScrolled || scrollTop > 0) {
-					$(window).scrollTop(scrollTop + ($(document).height() - height));
+					$window.scrollTop(scrollTop + ($(document).height() - height));
 				}
 			} else {
 				components.get('topic').append(html);
 			}
 
-			const removedEls = infinitescroll.removeExtra($('[component="post"]'), direction, Math.max(20, config.postsPerPage * 2));
-			removeNecroPostMessages(removedEls);
-
 			await Posts.onNewPostsAddedToDom(html);
-
+			removeNecroPostMessages(removedEls);
 			hooks.fire('action:posts.loaded', { posts: data.posts });
 
 			callback(html);
@@ -317,9 +317,8 @@ define('forum/topic/posts', [
 		if (!necroThreshold || (config.topicPostSort !== 'newest_to_oldest' && config.topicPostSort !== 'oldest_to_newest')) {
 			return;
 		}
-		const height = $(document).height();
-		const scrollTop = $(window).scrollTop();
-		let updateScrollTop = false;
+
+		const scrollTop = $window.scrollTop();
 		const postEls = $('[component="post"]').toArray();
 		await Promise.all(postEls.map(async function (post) {
 			post = $(post);
@@ -352,11 +351,13 @@ define('forum/topic/posts', [
 				const html = await app.parseAndTranslate('partials/topic/necro-post', { text: translationText });
 				html.attr('data-necro-post-index', prev.attr('data-index'));
 				html.insertBefore(post);
-				updateScrollTop = true;
 			}
 		}));
-		if (updateScrollTop && scrollTop > 0) {
-			$(window).scrollTop(scrollTop + ($(document).height() - height));
+		if (scrollTop > 0) {
+			const newScrollTop = $window.scrollTop();
+			if (newScrollTop < scrollTop) {
+				$window.scrollTop(scrollTop);
+			}
 		}
 	}