diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-18 18:07:38 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-18 18:07:38 +0100 |
| commit | bdfe2c77868afd59716103091b0dfa05060252d5 (patch) | |
| tree | 83bb1d5522e2c12ea778c84879f269ab56d712c0 /view/js/main.js | |
| parent | 68ecc673b109be50dc04cf72af8ce2296c70b86b (diff) | |
| parent | 595be9919b0ce85087937985444477189381976c (diff) | |
| download | volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.tar.gz volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.tar.bz2 volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.zip | |
Merge remote-tracking branch 'upstream/master'
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(); |