diff options
| author | nobody <nobody@zotlabs.com> | 2021-04-05 23:15:01 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-04-05 23:15:01 -0700 |
| commit | 9359fc065c72243bd85f0fc3db842976f07183cc (patch) | |
| tree | 37551feefe6fff472b9c346a7a8c3cd9080d8946 /view/js/main.js | |
| parent | 878be8fff0328ee4ab978de20e7e385244ac54ec (diff) | |
| parent | 19daadbfd7f281e27dffdc53d0e8ebeb837e1ae3 (diff) | |
| download | volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.tar.gz volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.tar.bz2 volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index cd95a8a0b..16dcd9cfe 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1563,7 +1563,7 @@ function zFormError(elm,x) { $(window).scroll(function () { if(typeof buildCmd == 'function') { // This is a content page with items and/or conversations - if($(window).scrollTop() + $(window).height() > $(document).height() - 500) { + if($(window).scrollTop() + $(window).height() > $('#conversation-end').position().top) { if((pageHasMoreContent) && (! loadingPage)) { next_page++; scroll_next = true; @@ -1574,7 +1574,7 @@ $(window).scroll(function () { } else { // This is some other kind of page - perhaps a directory - if($(window).scrollTop() + $(window).height() > $(document).height() - 500) { + if($('#page-end').length && ($(window).scrollTop() + $(window).height() > $('#page-end').position().top)) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { next_page++; scroll_next = true; |