From 8ae2afff0575d0968cb504523f4e6d160151a38c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 29 Mar 2016 22:49:10 -0400 Subject: [PATCH] Revert "more tweaks to threshold" This reverts commit 1783a07067dff9303ba92e753b40b46d3eb81114. --- public/less/global.less | 2 +- public/src/client/topic/posts.js | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/public/less/global.less b/public/less/global.less index 458fa4b8e6..d9f16c74e8 100644 --- a/public/less/global.less +++ b/public/less/global.less @@ -14,7 +14,7 @@ &[data-state="unloaded"], &[data-state="loading"] { display: inherit; - height: 2rem; + height: 1rem; opacity: 0; } diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 35e7ec5d29..5823d81b65 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -10,9 +10,7 @@ define('forum/topic/posts', [ 'components' ], function(pagination, infinitescroll, postTools, navigator, components) { - var Posts = { - _threshold: 0 - }; + var Posts = {}; Posts.onNewPost = function(data) { if (!data || !data.posts || !data.posts.length) { @@ -257,7 +255,6 @@ define('forum/topic/posts', [ If no threshold is defined, loaded images will push down content, as per default */ - Posts._threshold = threshold; var images = components.get('post/content').find('img[data-state="unloaded"]'), visible = images.filter(function() { @@ -275,7 +272,7 @@ define('forum/topic/posts', [ newHeight = document.body.clientHeight; var imageRect = this.getBoundingClientRect(); - if (imageRect.top < Posts._threshold) { + if (imageRect.top < threshold) { scrollTop = scrollTop + (newHeight - oldHeight); $(window).scrollTop(scrollTop); }