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

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
Baris Usakli
2017-07-13 15:02:23 -04:00
parent ea29e3e250 6ba913d6e6
commit f1f8a587d4
35 changed files with 212 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,7 @@ define('navigator', ['forum/pagination', 'components'], function (pagination, co
}
}
var page = Math.max(1, Math.ceil(index / config.postsPerPage));
var page = Math.max(1, Math.ceil((index + 1) / config.postsPerPage));
if (parseInt(page, 10) !== ajaxify.data.pagination.currentPage) {
pagination.loadPage(page, function () {

2
public/src/modules/search.js
View File

@@ -156,7 +156,7 @@ define('search', ['navigator', 'translator', 'storage'], function (nav, translat
return app.alertError(err.message);
}
nav.scrollToPost(postIndex, true);
nav.scrollToIndex(postIndex, true);
});
} else {
translator.translate('[[search:no-matches]]', function (text) {