From 678e4d11168d51d9ecc2a2278ff91ac76d853b9d Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Sun, 12 Jan 2014 18:03:54 -0700 Subject: [PATCH] I guess that got reverted in a merge. --- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/General/Index.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index e482abf69..7cde1f003 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -2323,7 +2323,7 @@ }, scroll: $.debounce(100, function() { var nodes, nodesPerPage, pageNum; - if (Index.req || Conf['Index Mode'] !== 'infinite' || ((d.body.scrollTop || doc.scrollTop) <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { + if (Index.req || Conf['Index Mode'] !== 'infinite' || (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { return; } pageNum = Index.getCurrentPage() + 1; diff --git a/builds/crx/script.js b/builds/crx/script.js index 866d07082..2af6326a2 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -2333,7 +2333,7 @@ }, scroll: $.debounce(100, function() { var nodes, nodesPerPage, pageNum; - if (Index.req || Conf['Index Mode'] !== 'infinite' || ((d.body.scrollTop || doc.scrollTop) <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { + if (Index.req || Conf['Index Mode'] !== 'infinite' || (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { return; } pageNum = Index.getCurrentPage() + 1; diff --git a/src/General/Index.coffee b/src/General/Index.coffee index ef1aca77c..91fe30033 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -110,7 +110,7 @@ Index = $.after $.id('delform'), Index.pagelist scroll: $.debounce 100, -> - return if Index.req or Conf['Index Mode'] isnt 'infinite' or ((d.body.scrollTop or doc.scrollTop) <= doc.scrollHeight - (300 + window.innerHeight)) or g.VIEW is 'thread' + return if Index.req or Conf['Index Mode'] isnt 'infinite' or (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) or g.VIEW is 'thread' pageNum = Index.getCurrentPage() + 1 return Index.endNotice() if pageNum >= Index.pagesNum nodesPerPage = Index.threadsNumPerPage * 2