diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-15 20:33:10 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-15 20:33:10 -0800 |
| commit | c5827c8b4f0079e6916a86e8cb51d7b4b2be13b2 (patch) | |
| tree | c6af25796f67b88af4804911b6df5e7e2e359a98 /view | |
| parent | bb381daae3b6bf8d230fd0c846a815689e0ff723 (diff) | |
| parent | d0090f09fb3af1360dba761f7ff51d5c4b3f15bb (diff) | |
| download | volse-hubzilla-c5827c8b4f0079e6916a86e8cb51d7b4b2be13b2.tar.gz volse-hubzilla-c5827c8b4f0079e6916a86e8cb51d7b4b2be13b2.tar.bz2 volse-hubzilla-c5827c8b4f0079e6916a86e8cb51d7b4b2be13b2.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/view/js/main.js b/view/js/main.js index f75f1f095..cf367ec87 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1231,21 +1231,8 @@ function zFormError(elm,x) { $(window).scroll(function () { if(typeof buildCmd == 'function') { // This is a content page with items and/or conversations - $('#more').hide(); - $('#no-more').hide(); - - if($(window).scrollTop() + $(window).height() > $(document).height() - 200) { - $('#more').css("top","400"); - $('#more').show(); - } - - if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { -// if($(window).scrollTop() > $(document).height() - ($(window).height() * 1.5 )) { - + if($(window).scrollTop() + $(window).height() > $(document).height() - 300) { if((pageHasMoreContent) && (! loadingPage)) { - $('#more').hide(); - $('#no-more').hide(); - next_page++; scroll_next = true; loadingPage = true; @@ -1255,18 +1242,8 @@ $(window).scroll(function () { } else { // This is some other kind of page - perhaps a directory - - if($(window).scrollTop() + $(window).height() > $(document).height() - 200) { - $('#more').css("top","400"); - $('#more').show(); - } - - if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { -// if($(window).scrollTop() > ($(document).height() - $(window).height() * 1.5 )) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 300) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { - $('#more').hide(); - $('#no-more').hide(); - next_page++; scroll_next = true; loadingPage = true; |