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

make ?page=[numbers] links work for users with pagination disabled. remove ?page when updating the URL for infinite scroll

Browse Source
This commit is contained in:
Ben Lubar
2016-07-17 15:47:58 -05:00
parent 7b855cd418
commit 85e42aee6e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,7 +260,7 @@ define('forum/topic', [
Topic.replaceURLTimeout = 0; Topic.replaceURLTimeout = 0;
if (history.replaceState) { if (history.replaceState) {
var search = (window.location.search ? window.location.search : ''); var search = (window.location.search && !/^\?page=\d+$/.test(window.location.search) ? window.location.search : '');
history.replaceState({ history.replaceState({
url: newUrl + search url: newUrl + search
}, null, window.location.protocol + '//' + window.location.host + RELATIVE_PATH + '/' + newUrl + search); }, null, window.location.protocol + '//' + window.location.host + RELATIVE_PATH + '/' + newUrl + search);

4
src/controllers/topics.js
View File

@@ -97,7 +97,9 @@ topicsController.get = function(req, res, callback) {
req.params.post_index = 0; req.params.post_index = 0;
} }
if (!settings.usePagination) { if (!settings.usePagination) {
currentPage = 1; if (req.params.post_index !== 0) {
currentPage = 1;
}
if (reverse) { if (reverse) {
postIndex = Math.max(0, postCount - (req.params.post_index || postCount) - Math.ceil(settings.postsPerPage / 2)); postIndex = Math.max(0, postCount - (req.params.post_index || postCount) - Math.ceil(settings.postsPerPage / 2));
} else { } else {