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

fixes a pagination bug

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-25 21:35:09 -05:00
parent dcefad1427
commit bf81159558
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/forum/category.js
View File

@@ -91,7 +91,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
addActiveUser(data); addActiveUser(data);
socket.emit('categories.getPageCount', templates.get('category_id'), function(err, newPageCount) { socket.emit('categories.getPageCount', templates.get('category_id'), function(err, newPageCount) {
pagination.recreatePaginationLinks('category', newPageCount); pagination.recreatePaginationLinks(newPageCount);
}); });
$('#topics-container span.timeago').timeago(); $('#topics-container span.timeago').timeago();

5
public/src/forum/pagination.js
View File

@@ -28,7 +28,10 @@ define(function() {
pagination.recreatePaginationLinks = function(newPageCount) { pagination.recreatePaginationLinks = function(newPageCount) {
pagination.pageCount = parseInt(newPageCount, 10); pagination.pageCount = parseInt(newPageCount, 10);
var pagesToShow = [1, pagination.pageCount]; var pagesToShow = [1];
if(pagination.pageCount !== 1) {
pagesToShow.push(pagination.pageCount);
}
var previous = pagination.currentPage - 1; var previous = pagination.currentPage - 1;
var next = pagination.currentPage + 1; var next = pagination.currentPage + 1;

4
public/src/forum/topic.js
View File

@@ -1065,9 +1065,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
function onNewPostPagination(data) { function onNewPostPagination(data) {
var posts = data.posts; var posts = data.posts;
socket.emit('topics.getPageCount', tid, function(err, newPageCount) { socket.emit('topics.getPageCount', templates.get('topic_id'), function(err, newPageCount) {
pagination.recreatePaginationLinks('topic', newPageCount); pagination.recreatePaginationLinks(newPageCount);
if(pagination.currentPage === pagination.pageCount) { if(pagination.currentPage === pagination.pageCount) {
createNewPosts(data); createNewPosts(data);