From cacde313cd4e298c45eb745d318533399d611039 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Mon, 10 Feb 2014 19:59:04 -0500 Subject: [PATCH] closes #995 --- public/src/forum/category.js | 2 +- src/socket.io/categories.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 094620bb9c..fd4b6efe42 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -138,7 +138,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { } Category.loadMoreTopics = function(cid) { - if (loadingMoreTopics) { + if (loadingMoreTopics || !$('#topics-container').length) { return; } diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js index 2e08d5bb54..a67e5e53c1 100644 --- a/src/socket.io/categories.js +++ b/src/socket.io/categories.js @@ -20,7 +20,7 @@ SocketCategories.loadMore = function(socket, data, callback) { user.getSettings(socket.uid, function(err, settings) { var start = parseInt(data.after, 10), - end = start + settings.topicsPerPage - 1; + end = start + settings.topicsPerPage - 1; categories.getCategoryTopics(data.cid, start, end, socket.uid, callback); });