diff options
author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
---|---|---|
committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
commit | 7da97c198182f8f6f4286e16d80de205431d81bb (patch) | |
tree | d03c22c98fa5e522fef874554be307969154c792 /view/js/main.js | |
parent | 4f793069bf4aafcfe77d50e47690173104ef23c7 (diff) | |
parent | 0b47fb9a91b58147e616ea75a23dea0d431c40f8 (diff) | |
download | volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.gz volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.bz2 volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.zip |
Merge pull request #3 from friendica/master
Merge from upstream
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 d6b405258..2e297c9d6 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1114,7 +1114,7 @@ $(window).scroll(function () { $('#more').show(); } - if($(window).scrollTop() + $(window).height() == $(document).height()) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); $('#no-more').hide(); @@ -1134,7 +1134,7 @@ $(window).scroll(function () { $('#more').show(); } - if($(window).scrollTop() + $(window).height() == $(document).height()) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); |