diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 29dcffa269..e61443337b 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -145,7 +145,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { loadingMoreTopics = true; socket.emit('categories.loadMore', { cid: cid, - after: $('#topics-container').children('.category-item').length + after: $('#topics-container').attr('data-nextstart') }, function (err, data) { if(err) { return app.alertError(err.message); @@ -153,6 +153,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { if (data && data.topics.length) { Category.onTopicsLoaded(data.topics); + $('#topics-container').attr('data-nextstart', data.nextStart); } loadingMoreTopics = false; }); diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js index 966ce0058d..17d4602403 100644 --- a/public/src/forum/recent.js +++ b/public/src/forum/recent.js @@ -86,7 +86,7 @@ define(function() { Recent.loadMoreTopics = function() { loadingMoreTopics = true; socket.emit('topics.loadMoreRecentTopics', { - after: $('#topics-container').children('li').length, + after: $('#topics-container').attr('data-nextstart'), term: active }, function(err, data) { if(err) { @@ -95,6 +95,7 @@ define(function() { if (data.topics && data.topics.length) { Recent.onTopicsLoaded('recent', data.topics); + $('#topics-container').attr('data-nextstart', data.nextStart); } loadingMoreTopics = false; diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js index b562ce1502..4f3024fbab 100644 --- a/public/src/forum/unread.js +++ b/public/src/forum/unread.js @@ -46,7 +46,7 @@ define(['forum/recent'], function(recent) { function loadMoreTopics() { loadingMoreTopics = true; socket.emit('topics.loadMoreUnreadTopics', { - after: parseInt($('#topics-container').attr('data-next-start'), 10) + after: $('#topics-container').attr('data-nextstart') }, function(err, data) { if(err) { return app.alertError(err.message); @@ -54,7 +54,7 @@ define(['forum/recent'], function(recent) { if (data.topics && data.topics.length) { recent.onTopicsLoaded('unread', data.topics); - $('#topics-container').attr('data-next-start', data.nextStart); + $('#topics-container').attr('data-nextstart', data.nextStart); } else { $('#load-more-btn').hide(); } diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 5b578dc604..a8b73e765c 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -28,7 +28,7 @@
-