diff --git a/mod/network.php b/mod/network.php index 60bb409e32..793f1ba42d 100644 --- a/mod/network.php +++ b/mod/network.php @@ -758,7 +758,6 @@ function network_infinite_scroll_head(App $a, &$htmlhead) ) { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); $htmlhead .= Renderer::replaceMacros($tpl, [ - '$pageno' => $pager->getPage(), '$reload_uri' => $pager->getBaseQueryString() ]); } diff --git a/view/js/main.js b/view/js/main.js index 1fe3d162eb..35a0529a0e 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -859,10 +859,6 @@ function loadScrollContent() { $("#scroll-loader").fadeIn('normal'); - // the page number to load is one higher than the actual - // page number - infinite_scroll.pageno+=1; - match = $("span.received").last(); if (match.length > 0) { received = match[0].innerHTML; @@ -893,7 +889,7 @@ function loadScrollContent() { // get the raw content from the next page and insert this content // right before "#conversation-end" - $.get(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_uriid=' + uriid + '&page=' + infinite_scroll.pageno, function(data) { + $.get(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_uriid=' + uriid, function(data) { $("#scroll-loader").hide(); if ($(data).length > 0) { $(data).insertBefore('#conversation-end'); diff --git a/view/templates/infinite_scroll_head.tpl b/view/templates/infinite_scroll_head.tpl index f95d8cf993..26dec53dab 100644 --- a/view/templates/infinite_scroll_head.tpl +++ b/view/templates/infinite_scroll_head.tpl @@ -2,7 +2,6 @@ {{* Create an object with the data which is needed for infinite scroll. For the relevant js part look at function loadContent() in main.js. *}} var infinite_scroll = { - "pageno" : {{$pageno}}, "reload_uri": "{{$reload_uri nofilter}}" }