kopia lustrzana https://github.com/friendica/friendica
Merge pull request #9290 from annando/infinite-pageno
Removing the page number from the infinite scrollingpull/9292/head
commit
f75150795a
|
@ -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()
|
||||
]);
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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}}"
|
||||
}
|
||||
</script>
|
||||
|
|
Ładowanie…
Reference in New Issue