diff options
| author | friendica <info@friendica.com> | 2014-09-16 19:09:30 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-16 19:09:30 -0700 |
| commit | ce36e8a8bb9ab5a96e395272e2045f3e6563666c (patch) | |
| tree | ff81b6a54650ae0c6586351ee133572ed8011971 | |
| parent | c4608d4c827881b0f0fa5e2031de3fbd5b0568d7 (diff) | |
| parent | eed6cbfb2a609536b62763aa8b412176c76b49c6 (diff) | |
| download | volse-hubzilla-ce36e8a8bb9ab5a96e395272e2045f3e6563666c.tar.gz volse-hubzilla-ce36e8a8bb9ab5a96e395272e2045f3e6563666c.tar.bz2 volse-hubzilla-ce36e8a8bb9ab5a96e395272e2045f3e6563666c.zip | |
Merge https://github.com/friendica/red into pending_merge
| -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(); |