Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-17 14:00:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not call navigator.update() when scrollToElement is explicitly passed a new index value

Browse Source
This commit is contained in:
Julian Lam
2022-09-19 11:10:35 -04:00
parent fa643eb808
commit b7287c1eb8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -552,15 +552,15 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct
navigator.scrollToPostIndex = function (postIndex, highlight, duration) {
const scrollTo = components.get('post', 'index', postIndex);
navigator.scrollToElement(scrollTo, highlight, duration);
navigator.scrollToElement(scrollTo, highlight, duration, postIndex);
};
navigator.scrollToTopicIndex = function (topicIndex, highlight, duration) {
const scrollTo = $('[component="category/topic"][data-index="' + topicIndex + '"]');
navigator.scrollToElement(scrollTo, highlight, duration);
navigator.scrollToElement(scrollTo, highlight, duration, topicIndex);
};
navigator.scrollToElement = function (scrollTo, highlight, duration) {
navigator.scrollToElement = function (scrollTo, highlight, duration, newIndex = null) {
if (!scrollTo.length) {
navigator.scrollActive = false;
return;
@@ -594,8 +594,13 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts'], funct
navigator.scrollActive = false;
highlightPost();
$('body').scrollTop($('body').scrollTop() - 1);
$('html').scrollTop($('html').scrollTop() - 1);
const scrollToRect = scrollTo.get(0).getBoundingClientRect();
if (!newIndex) {
navigator.update(scrollToRect.top);
} else {
navigator.setIndex(newIndex);
}
}
let scrollTop = 0;