From d0e0a21e2fbd0e5c1f84812e876d52e3f1a6f5f8 Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Fri, 10 Jan 2014 22:56:26 -0700 Subject: [PATCH] Prevent Index.scroll() from firing while loading the Index --- 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 df3fec058..973298cf1 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -2318,7 +2318,7 @@ }, scroll: $.debounce(100, function() { var nodes, nodesPerPage, pageNum; - if (Conf['Index Mode'] !== 'paged' || (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { + if (Index.req || Conf['Index Mode'] !== 'paged' || (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 6354ae7c5..8842592e9 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -2328,7 +2328,7 @@ }, scroll: $.debounce(100, function() { var nodes, nodesPerPage, pageNum; - if (Conf['Index Mode'] !== 'paged' || (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) || g.VIEW === 'thread') { + if (Index.req || Conf['Index Mode'] !== 'paged' || (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 2c7297887..1fdab07df 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -108,7 +108,7 @@ Index = $.after $.id('delform'), Index.pagelist scroll: $.debounce 100, -> - return if Conf['Index Mode'] isnt 'paged' or (doc.scrollTop <= doc.scrollHeight - (300 + window.innerHeight)) or g.VIEW is 'thread' + return if Index.req or Conf['Index Mode'] isnt 'paged' 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