From 553731deedbe20f0bc914909e3a3c85280e5e972 Mon Sep 17 00:00:00 2001
From: lalka2016 <99399973+lalka2016@users.noreply.github.com>
Date: Fri, 11 Aug 2023 14:14:36 +0300
Subject: [PATCH] Fix scroll

---
 Web/Presenters/templates/Wall/Feed.xml |  2 +-
 Web/static/js/al_wall.js               | 19 +++++++++++++++++++
 Web/static/js/openvk.cls.js            |  4 ----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml
index 3b5ed3b2..ace72fc2 100644
--- a/Web/Presenters/templates/Wall/Feed.xml
+++ b/Web/Presenters/templates/Wall/Feed.xml
@@ -51,7 +51,7 @@
         {include "../components/paginator.xml", conf => $paginatorConf}
     {/if}
 
-    <script>
+    <script n:if="$thisUser->getPaginatorType() == 0">
         u("#pageSelect").nodes[0].value = {$paginatorConf->perPage};
         
         u("#pageSelect").on("change", function(e) {
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 2999b5e1..836c9352 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -272,9 +272,11 @@ async function showArticle(note_id) {
 
 $(document).on("click", ".showMore", async (e) => {
     e.currentTarget.innerHTML = `<img id="loader" src="/assets/packages/static/openvk/img/loading_mini.gif">`
+
     let url = new URL(location.href)
     let newPage = Number(e.currentTarget.dataset.page) + 1
     url.searchParams.set("p", newPage)
+    url.searchParams.set("posts", 10)
 
     let xhr = new XMLHttpRequest
     xhr.open("GET", url)
@@ -328,3 +330,20 @@ $(document).on("click", ".showMore", async (e) => {
 
     xhr.send()
 })
+
+let showMoreObserver = new IntersectionObserver(entries => {
+    entries.forEach(x => {
+        if(x.isIntersecting) {
+            $(".showMore").click()
+        }
+    })
+}, {
+    root: null,
+    rootMargin: "0px",
+    threshold: 0
+})
+
+let showMore = document.querySelector('.showMore');
+
+if(showMore != null)
+    showMoreObserver.observe(showMore);
diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js
index 8ff25909..6efc941d 100644
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@@ -691,8 +691,4 @@ $(document).on("scroll", () => {
             $(".floating_sidebar")[0].classList.remove("hide_anim");
         }, 250);
     }
-
-    if($(window).scrollTop() == $(document).height() - $(window).height() && document.querySelector(".showMore") != null) {
-        $(".showMore").click()
-    }
 })