Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-03 22:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix navigator method not getting removed

Browse Source
This commit is contained in:
barisusakli
2016-08-31 23:15:17 +03:00
parent 7afd2925af
commit b84f36cc20
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/src/modules/navigator.js
View File

@@ -9,6 +9,8 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
var navigator = {};
var index = 1;
var count = 0;
var navigatorUpdateTimeoutId = 0;
navigator.scrollActive = false;
navigator.init = function(selector, count, toTop, toBottom, callback, calculateIndex) {
@@ -17,15 +19,8 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
navigator.callback = callback;
toTop = toTop || function() {};
toBottom = toBottom || function() {};
var navigatorUpdateTimeoutId = 0;
$(window).off('scroll', navigator.update).on('scroll', function() {
if (navigatorUpdateTimeoutId) {
clearTimeout(navigatorUpdateTimeoutId);
navigatorUpdateTimeoutId = 0;
}
navigatorUpdateTimeoutId = setTimeout(navigator.update, 100);
});
$(window).off('scroll', navigator.delayedUpdate).on('scroll', navigator.delayedUpdate);
$('.pagination-block .dropdown-menu').off('click').on('click', function(e) {
e.stopPropagation();
@@ -98,6 +93,14 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
$('.pagination-block').toggleClass('ready', flag);
}
navigator.delayedUpdate = function() {
if (navigatorUpdateTimeoutId) {
clearTimeout(navigatorUpdateTimeoutId);
navigatorUpdateTimeoutId = 0;
}
navigatorUpdateTimeoutId = setTimeout(navigator.update, 100);
};
navigator.update = function(threshold) {
/*
The "threshold" is defined as the distance from the top of the page to
@@ -136,7 +139,7 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
} else if (nearBottom) {
index = count;
}
console.log('wtf', index ,count)
// If a threshold is undefined, try to determine one based on new index
if (threshold === undefined && ajaxify.data.template.topic === true) {
if (atTop) {