Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 12:59:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix previous commit so it only uses window height if viewport <=0

Browse Source
This commit is contained in:
barisusakli
2015-09-26 23:03:20 -04:00
parent e78de34122
commit b2dbb127e2
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/src/client/infinitescroll.js
View File

@@ -12,19 +12,22 @@ define('forum/infinitescroll', ['translator'], function(translator) {
scroll.init = function(el, cb) {
if (typeof el === 'function') {
cb = el;
el = null;
callback = el;
container = $(document);
} else {
callback = cb;
container = el || $(document);
}
callback = cb;
container = el || $(document);
$(window).off('scroll', onScroll).on('scroll', onScroll);
};
function onScroll() {
var currentScrollTop = $(window).scrollTop();
var wh = $(window).height();
var viewportHeight = container.height() - wh;
var offsetTop = container.offset() ? container.offset().top : 0;
var scrollPercent = 100 * (currentScrollTop - offsetTop) / Math.max(wh, (container.height() - wh));
var scrollPercent = 100 * (currentScrollTop - offsetTop) / (viewportHeight <= 0 ? wh : viewportHeight);
var top = 20, bottom = 80;

2
public/src/client/recent.js
View File

@@ -22,7 +22,7 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function(infinite
$('#new-topics-alert').on('click', function() {
$(this).addClass('hide');
});
console.log('da fuq is going on')
infinitescroll.init(Recent.loadMoreTopics);
};