strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9487 from MrPetovan/bug/9432-network-infinite-load-ajax

Browse source 
Fix infinite content ajax call parameters
This commit is contained in:
Michael Vogel 2020-11-03 19:47:02 +01:00 committed by GitHub
parent 5029b992ad 481925c353
commit 8fa62cbbbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
view/js/main.js
View file

@ -893,16 +893,29 @@ function loadScrollContent() {
// get the raw content from the next page and insert this content // get the raw content from the next page and insert this content
// right before "#conversation-end" // right before "#conversation-end"
$.get(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_uriid=' + uriid, function(data) { $.get({
url: infinite_scroll.reload_uri,
data: {
'mode' : 'raw',
'last_received' : received,
'last_commented': commented,
'last_created' : created,
'last_uriid' : uriid
}
})
.done(function(data) {
$("#scroll-loader").hide(); $("#scroll-loader").hide();
if ($(data).length > 0) { if ($(data).length > 0) {
$(data).insertBefore('#conversation-end'); $(data).insertBefore('#conversation-end');
lockLoadContent = false;
} else { } else {
$("#scroll-end").fadeIn('normal'); $("#scroll-end").fadeIn('normal');
} }
document.dispatchEvent(new Event('postprocess_liveupdate')); document.dispatchEvent(new Event('postprocess_liveupdate'));
})
.always(function () {
$("#scroll-loader").hide();
lockLoadContent = false;
}); });
} }