From b46dc96b52b7ee0f3ad77bb4d86a5db7016f2696 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Thu, 13 Mar 2014 02:07:26 -0700 Subject: [PATCH] window.scrollY works in Chrome and Firefox. --- builds/4chan-X.user.js | 4 ++-- builds/crx/script.js | 4 ++-- src/General/Index.coffee | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index df490233f..62910de0f 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -2706,8 +2706,8 @@ return $.rmClass(doc, 'index-loading'); }); }, - scroll: $.debounce(100, function() { - if (Index.req || Conf['Index Mode'] !== 'infinite' || (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { + scroll: $.debounce(500, function() { + if (Index.req || Conf['Index Mode'] !== 'infinite' || (window.scrollY <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { return; } Index.pageNum = (Index.pageNum || Index.getCurrentPage()) + 1; diff --git a/builds/crx/script.js b/builds/crx/script.js index b0be6374c..9459e1635 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -2765,8 +2765,8 @@ return $.rmClass(doc, 'index-loading'); }); }, - scroll: $.debounce(100, function() { - if (Index.req || Conf['Index Mode'] !== 'infinite' || (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { + scroll: $.debounce(500, function() { + if (Index.req || Conf['Index Mode'] !== 'infinite' || (window.scrollY <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { return; } Index.pageNum = (Index.pageNum || Index.getCurrentPage()) + 1; diff --git a/src/General/Index.coffee b/src/General/Index.coffee index df05b06ff..116065b54 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -151,8 +151,8 @@ Index = $.after $.id('delform'), Index.pagelist $.rmClass doc, 'index-loading' - scroll: $.debounce 100, -> - return if Index.req or Conf['Index Mode'] isnt 'infinite' or (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) or g.VIEW is 'thread' + scroll: $.debounce 500, -> + return if Index.req or Conf['Index Mode'] isnt 'infinite' or (window.scrollY <= doc.scrollHeight - (300 + window.innerHeight)) or g.VIEW is 'thread' Index.pageNum = (Index.pageNum or Index.getCurrentPage()) + 1 # Avoid having to pushState to keep track of the current page return Index.endNotice() if Index.pageNum >= Index.pagesNum