From d1ec101248b0cead871953fb98310e2aaea8f6fb Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 7 Apr 2014 17:55:14 -0400 Subject: [PATCH] fixed infinite load and select --- public/src/forum/popular.js | 2 +- public/src/forum/recent.js | 6 +++--- public/src/forum/unread.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/forum/popular.js b/public/src/forum/popular.js index c4817bbd71..5b99451cf3 100644 --- a/public/src/forum/popular.js +++ b/public/src/forum/popular.js @@ -35,7 +35,7 @@ define(['forum/recent'], function(recent) { } if (data.topics && data.topics.length) { - recent.onTopicsLoaded('popular', data.topics); + recent.onTopicsLoaded('popular', data.topics, false); $('#topics-container').attr('data-nextstart', data.nextStart); } else { $('#load-more-btn').hide(); diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js index 17d5abedc8..1af4e764a5 100644 --- a/public/src/forum/recent.js +++ b/public/src/forum/recent.js @@ -107,7 +107,7 @@ define(function() { } if (data.topics && data.topics.length) { - Recent.onTopicsLoaded('recent', data.topics); + Recent.onTopicsLoaded('recent', data.topics, false); $('#topics-container').attr('data-nextstart', data.nextStart); } @@ -115,9 +115,9 @@ define(function() { }); } - Recent.onTopicsLoaded = function(templateName, topics) { + Recent.onTopicsLoaded = function(templateName, topics, showSelect) { ajaxify.loadTemplate(templateName, function(template) { - var html = templates.parse(templates.getBlock(template, 'topics'), {topics: topics}); + var html = templates.parse(templates.getBlock(template, 'topics'), {topics: topics, showSelect: showSelect}); translator.translate(html, function(translatedHTML) { $('#category-no-topics').remove(); diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js index 3cac9fd7e5..ef53c3dbc3 100644 --- a/public/src/forum/unread.js +++ b/public/src/forum/unread.js @@ -114,7 +114,7 @@ define(['forum/recent'], function(recent) { } if (data.topics && data.topics.length) { - recent.onTopicsLoaded('unread', data.topics); + recent.onTopicsLoaded('unread', data.topics, true); $('#topics-container').attr('data-nextstart', data.nextStart); } else { $('#load-more-btn').hide();