mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-07-05 23:38:54 +02:00
Merge branch 'master' into develop
This commit is contained in:
@@ -20,8 +20,9 @@ define('forum/infinitescroll', ['hooks', 'alerts', 'api'], function (hooks, aler
|
||||
}
|
||||
previousScrollTop = $(window).scrollTop();
|
||||
$(window).off('scroll', startScrollTimeout).on('scroll', startScrollTimeout);
|
||||
|
||||
if ($body.height() <= $(window).height()) {
|
||||
if ($body.height() <= $(window).height() && (
|
||||
!ajaxify.data.hasOwnProperty('pageCount') || ajaxify.data.pageCount > 1
|
||||
)) {
|
||||
callback(1);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user