From 3a8dca6fb92eebf07d749368875eb4d206cc4e8e Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 26 Nov 2013 23:55:55 -0500
Subject: [PATCH] closes #560
---
public/src/forum/category.js | 10 +++++++---
public/src/forum/unread.js | 8 ++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/public/src/forum/category.js b/public/src/forum/category.js
index 2ddee3d5af..b4c5a227ba 100644
--- a/public/src/forum/category.js
+++ b/public/src/forum/category.js
@@ -1,5 +1,6 @@
define(function () {
- var Category = {};
+ var Category = {},
+ loadingMoreTopics = false;
Category.init = function() {
var cid = templates.get('category_id'),
@@ -8,8 +9,7 @@ define(function () {
googleEl = jQuery('#google-share'),
twitter_url = templates.get('twitter-intent-url'),
facebook_url = templates.get('facebook-share-url'),
- google_url = templates.get('google-share-url'),
- loadingMoreTopics = false;
+ google_url = templates.get('google-share-url');
app.enterRoom('category_' + cid);
@@ -147,6 +147,10 @@ define(function () {
Category.loadMoreTopics = function(cid) {
+ if (loadingMoreTopics) {
+ return;
+ }
+
loadingMoreTopics = true;
socket.emit('api:category.loadMore', {
cid: cid,
diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js
index a80939f917..6dd8ae270c 100644
--- a/public/src/forum/unread.js
+++ b/public/src/forum/unread.js
@@ -1,9 +1,8 @@
define(function() {
- var Unread = {};
+ var Unread = {},
+ loadingMoreTopics = false;
Unread.init = function() {
- var loadingMoreTopics = false;
-
app.enter_room('recent_posts');
ajaxify.register_events([
@@ -109,8 +108,9 @@ define(function() {
});
- if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20)
+ if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) {
$('#load-more-btn').show();
+ }
$('#load-more-btn').on('click', function() {
loadMoreTopics();