recent unread cleanup

public/src/app.js

@@ -396,6 +396,16 @@ var socket,
 		});
 	};
 
+	app.enableInfiniteLoading = function(callback) {
+		$(window).off('scroll').on('scroll', function() {
+			var bottom = ($(document).height() - $(window).height()) * 0.9;
+
+			if ($(window).scrollTop() > bottom) {
+				callback();
+			}
+		});
+	}
+
 	var	titleObj = {
 			active: false,
 			interval: undefined,

public/src/forum/category.js

@@ -44,10 +44,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 	function enableInfiniteLoading() {
 		if(!config.usePagination) {
-			$(window).off('scroll').on('scroll', function (ev) {
+			app.enableInfiniteLoading(function() {
-				var bottom = ($(document).height() - $(window).height()) * 0.9;
+				if(!loadingMoreTopics) {
-
-				if ($(window).scrollTop() > bottom && !loadingMoreTopics) {
 					Category.loadMoreTopics(templates.get('category_id'));
 				}
 			});

public/src/forum/recent.js

@@ -1,20 +1,16 @@
 define(function() {
 	var	Recent = {};
 
-	Recent.newTopicCount = 0;
+	var newTopicCount = 0,
-	Recent.newPostCount = 0;
+		newPostCount = 0,
-	Recent.loadingMoreTopics = false;
+		loadingMoreTopics = false;
 
 	var active = '';
 
 	Recent.init = function() {
 		app.enterRoom('recent_posts');
 
-		ajaxify.register_events([
+		Recent.watchForNewPosts();
-			'event:new_topic',
-			'event:new_post'
-		]);
-
 
 		function getActiveSection() {
 			var url = window.location.href,
@@ -37,78 +33,90 @@ define(function() {
 			$(this).addClass('hide');
 		});
 
+
+		app.enableInfiniteLoading(function() {
+			if(!loadingMoreTopics) {
+				Recent.loadMoreTopics();
+			}
+		});
+	};
+
+	Recent.watchForNewPosts = function () {
+
+		newPostCount = 0;
+		newTopicCount = 0;
+
+		ajaxify.register_events([
+			'event:new_topic',
+			'event:new_post'
+		]);
+
 		socket.on('event:new_topic', function(data) {
-			++Recent.newTopicCount;
+			++newTopicCount;
 			Recent.updateAlertText();
 		});
 
 		socket.on('event:new_post', function(data) {
-			++Recent.newPostCount;
+			++newPostCount;
 			Recent.updateAlertText();
 		});
-
-		$(window).off('scroll').on('scroll', function() {
-			var bottom = ($(document).height() - $(window).height()) * 0.9;
-
-			if ($(window).scrollTop() > bottom && !Recent.loadingMoreTopics) {
-				Recent.loadMoreTopics();
 	}
-		});
-	};
 
 	Recent.updateAlertText = function() {
 		var text = 'There';
 
-		if (Recent.newTopicCount > 1) {
+		if (newTopicCount > 1) {
-			text += ' are ' + Recent.newTopicCount + ' new topics';
+			text += ' are ' + newTopicCount + ' new topics';
-		} else if (Recent.newTopicCount === 1) {
+		} else if (newTopicCount === 1) {
 			text += ' is a new topic';
 		}
 
-		if (Recent.newPostCount > 1) {
+		if (newPostCount > 1) {
-			text += (Recent.newTopicCount?' and ':' are ') + Recent.newPostCount + ' new posts';
+			text += (newTopicCount?' and ':' are ') + newPostCount + ' new posts';
 		} else if(newPostCount === 1) {
-			text += (Recent.newTopicCount?' and ':' is ') + ' a new post';
+			text += (newTopicCount?' and ':' is ') + ' a new post';
 		}
 
 		text += '. Click here to reload.';
 
 		$('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow');
+		$('#category-no-topics').addClass('hide');
 	}
 
-	Recent.onTopicsLoaded = function(topics) {
+	Recent.loadMoreTopics = function() {
-		var html = templates.prepare(templates['recent'].blocks['topics']).parse({
+		loadingMoreTopics = true;
+		socket.emit('topics.loadMoreRecentTopics', {
+			after: $('#topics-container').children('li').length,
+			term: active
+		}, function(err, data) {
+			if(err) {
+				return app.alertError(err.message);
+			}
+
+			if (data.topics && data.topics.length) {
+				Recent.onTopicsLoaded('recent', data.topics);
+			}
+
+			loadingMoreTopics = false;
+		});
+	}
+
+	Recent.onTopicsLoaded = function(template, topics) {
+		var html = templates.prepare(templates[template].blocks['topics']).parse({
 			topics: topics
 		});
 
 		translator.translate(html, function(translatedHTML) {
-			var container = $('#topics-container');
 
 			$('#category-no-topics').remove();
 
 			html = $(translatedHTML);
-			container.append(html);
+			$('#topics-container').append(html);
 			$('span.timeago').timeago();
 			app.createUserTooltips();
 			app.makeNumbersHumanReadable(html.find('.human-readable-number'));
 		});
 	}
 
-	Recent.loadMoreTopics = function() {
-		Recent.loadingMoreTopics = true;
-		socket.emit('topics.loadMoreRecentTopics', {
-			after: $('#topics-container').children('li').length,
-			term: active
-		}, function(err, data) {
-			if(err) {
-				return app.alertError(err.message);
-			}
-			if (data.topics && data.topics.length) {
-				Recent.onTopicsLoaded(data.topics);
-			}
-			Recent.loadingMoreTopics = false;
-		});
-	}
-
 	return Recent;
 });

public/src/forum/topic.js

@@ -346,10 +346,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 		function enableInfiniteLoading() {
 			if(!config.usePagination) {
-				$(window).off('scroll').on('scroll', function() {
+				app.enableInfiniteLoading(function() {
-					var bottom = ($(document).height() - $(window).height()) * 0.9;
+					if (!infiniteLoaderActive && $('#post-container').children().length) {
-
-					if ($(window).scrollTop() > bottom && !infiniteLoaderActive && $('#post-container').children().length) {
 						loadMorePosts(tid, function(posts) {
 							fixDeleteStateForPosts();
 						});

public/src/forum/unread.js

@@ -1,53 +1,15 @@
-define(function() {
+define(['forum/recent'], function(recent) {
 	var Unread = {},
 		loadingMoreTopics = false;
 
 	Unread.init = function() {
 		app.enterRoom('recent_posts');
 
-		ajaxify.register_events([
-			'event:new_topic',
-			'event:new_post',
-			'topics.markAllRead'
-		]);
-
-		var newTopicCount = 0,
-			newPostCount = 0;
-
 		$('#new-topics-alert').on('click', function() {
 			$(this).addClass('hide');
 		});
 
-		socket.on('event:new_topic', function(data) {
+		recent.watchForNewPosts();
-			++newTopicCount;
-			updateAlertText();
-		});
-
-		function updateAlertText() {
-			var text = 'There';
-
-			if (newTopicCount > 1) {
-				text += ' are ' + newTopicCount + ' new topics';
-			} else if (newTopicCount === 1) {
-				text += ' is a new topic';
-			}
-
-			if (newPostCount > 1) {
-				text += (newTopicCount?' and ':' are ') + newPostCount + ' new posts';
-			} else if(newPostCount === 1) {
-				text += (newTopicCount?' and ':' is ') + ' a new post';
-			}
-
-			text += '. Click here to reload.';
-
-			$('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow');
-			$('#category-no-topics').addClass('hidden');
-		}
-
-		socket.on('event:new_post', function(data) {
-			++newPostCount;
-			updateAlertText();
-		});
 
 		$('#mark-allread-btn').on('click', function() {
 			var btn = $(this);
@@ -67,24 +29,19 @@ define(function() {
 			});
 		});
 
-		function onTopicsLoaded(topics) {
+		if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) {
+			$('#load-more-btn').show();
+		}
 
-			var html = templates.prepare(templates['unread'].blocks['topics']).parse({
+		$('#load-more-btn').on('click', function() {
-				topics: topics
+			loadMoreTopics();
 		});
 
-			translator.translate(html, function(translatedHTML) {
+		app.enableInfiniteLoading(function() {
-				var container = $('#topics-container');
+			if(!loadingMoreTopics) {
-
+				loadMoreTopics();
-				$('#category-no-topics').remove();
-
-				html = $(translatedHTML);
-				container.append(html);
-				$('span.timeago').timeago();
-				app.createUserTooltips();
-				app.makeNumbersHumanReadable(html.find('.human-readable-number'));
-			});
 			}
+		});
 
 		function loadMoreTopics() {
 			loadingMoreTopics = true;
@@ -96,7 +53,7 @@ define(function() {
 				}
 
 				if (data.topics && data.topics.length) {
-					onTopicsLoaded(data.topics);
+					recent.onTopicsLoaded('unread', data.topics);
 					$('#topics-container').attr('data-next-start', data.nextStart);
 				} else {
 					$('#load-more-btn').hide();
@@ -105,23 +62,6 @@ define(function() {
 				loadingMoreTopics = false;
 			});
 		}
-
-		$(window).off('scroll').on('scroll', function() {
-			var bottom = ($(document).height() - $(window).height()) * 0.9;
-
-			if ($(window).scrollTop() > bottom && !loadingMoreTopics) {
-				loadMoreTopics();
-			}
-		});
-
-
-		if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) {
-			$('#load-more-btn').show();
-		}
-
-		$('#load-more-btn').on('click', function() {
-			loadMoreTopics();
-		});
 	};
 
 	return Unread;