From afb86aa90896c04101e384edcb4fef6514fbefcc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 15 Feb 2016 22:20:55 +0100 Subject: clean up some unused stuff and start loading content a bit earlier --- view/js/main.js | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'view') 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; -- cgit v1.2.3