From e78de34122f15546a4fc5f73283df68f30f020df Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 26 Sep 2015 22:48:35 -0400 Subject: [PATCH] fix case where container might be smaller than viewport --- public/src/client/infinitescroll.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js index 4c79c52757..d5280c9449 100644 --- a/public/src/client/infinitescroll.js +++ b/public/src/client/infinitescroll.js @@ -22,8 +22,9 @@ define('forum/infinitescroll', ['translator'], function(translator) { function onScroll() { var currentScrollTop = $(window).scrollTop(); + var wh = $(window).height(); var offsetTop = container.offset() ? container.offset().top : 0; - var scrollPercent = 100 * (currentScrollTop - offsetTop) / (container.height() - $(window).height()); + var scrollPercent = 100 * (currentScrollTop - offsetTop) / Math.max(wh, (container.height() - wh)); var top = 20, bottom = 80;