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

#3064

Browse Source
This commit is contained in:
barisusakli
2015-04-20 14:00:43 -04:00
parent e309a188c3
commit dd92b06f16
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/client/topic.js
View File

@@ -82,7 +82,8 @@ define('forum/topic', [
function handleBookmark(tid) { function handleBookmark(tid) {
var bookmark = localStorage.getItem('topic:' + tid + ':bookmark'); var bookmark = localStorage.getItem('topic:' + tid + ':bookmark');
var postIndex = getPostIndex(); var postIndex = getPostIndex();
if (postIndex) {
if (postIndex && window.location.search.indexOf('page=') === -1) {
navigator.scrollToPost(postIndex - 1, true); navigator.scrollToPost(postIndex - 1, true);
} else if (bookmark && (!config.usePagination || (config.usePagination && pagination.currentPage === 1)) && ajaxify.variables.get('postcount') > 1) { } else if (bookmark && (!config.usePagination || (config.usePagination && pagination.currentPage === 1)) && ajaxify.variables.get('postcount') > 1) {
app.alert({ app.alert({

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

@@ -106,6 +106,10 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
} }
}); });
if (topIndex && !bottomIndex) {
bottomIndex = topIndex;
}
if (typeof navigator.callback === 'function' && topIndex && bottomIndex) { if (typeof navigator.callback === 'function' && topIndex && bottomIndex) {
index = navigator.callback(topIndex, bottomIndex, count); index = navigator.callback(topIndex, bottomIndex, count);
navigator.updateTextAndProgressBar(); navigator.updateTextAndProgressBar();
@@ -169,17 +173,13 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
duration = duration !== undefined ? duration : 400; duration = duration !== undefined ? duration : 400;
navigator.scrollActive = true; navigator.scrollActive = true;
if(components.get('post/anchor', postIndex).length) { if (components.get('post/anchor', postIndex).length) {
return scrollToPid(postIndex, highlight, duration, offset); return scrollToPid(postIndex, highlight, duration, offset);
} }
if (config.usePagination) { if (config.usePagination) {
if (window.location.search.indexOf('page') !== -1) {
navigator.update();
return;
}
var page = Math.ceil((postIndex + 1) / config.postsPerPage); var page = Math.max(1, Math.ceil(postIndex / config.postsPerPage));
if(parseInt(page, 10) !== pagination.currentPage) { if(parseInt(page, 10) !== pagination.currentPage) {
pagination.loadPage(page, function() { pagination.loadPage(page, function() {
@@ -198,7 +198,7 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
function scrollToPid(postIndex, highlight, duration, offset) { function scrollToPid(postIndex, highlight, duration, offset) {
var scrollTo = components.get('post/anchor', postIndex); var scrollTo = components.get('post/anchor', postIndex);
if (!scrollTo) { if (!scrollTo.length) {
navigator.scrollActive = false; navigator.scrollActive = false;
return; return;
} }