fixed #649 - Once you hit the end, infinite loader will stop for good. If infinite loader is active when the browser hits the bottom, updateHeader will not assume 100%.

public/src/forum/topic.js

@@ -957,7 +957,8 @@ define(['composer'], function(composer) {
 		});
 
 		setTimeout(function() {
-			if (scrollTop + windowHeight == jQuery(document).height()) {
+			console.log(infiniteLoaderActive);
+			if (scrollTop + windowHeight == jQuery(document).height() && !infiniteLoaderActive) {
 				pagination.innerHTML = Topic.postCount + ' out of ' + Topic.postCount;
 				progressBar.width('100%');
 			}
@@ -1099,11 +1100,10 @@ define(['composer'], function(composer) {
 			return;
 		}
 
-		infiniteLoaderActive = true;
 
 		if (indicatorEl.attr('done') === '0') {
+			infiniteLoaderActive = true;
 			indicatorEl.fadeIn();
-		}
 
 			socket.emit('topics.loadMore', {
 				tid: tid,
@@ -1119,13 +1119,17 @@ define(['composer'], function(composer) {
 					createNewPosts(data, true);
 				} else {
 					indicatorEl.attr('done', '1');
+					updateHeader();
 				}
+
 				indicatorEl.fadeOut();
+
 				if (callback) {
 					callback(data.posts);
 				}
 			});
 		}
+	}
 
 	return Topic;
 });

src/socket.io/topics.js

@@ -204,7 +204,9 @@ SocketTopics.loadMore = function(socket, data, callback) {
 		end = start + 9;
 
 	topics.getTopicPosts(data.tid, start, end, socket.uid, function(err, posts) {
+		setTimeout(function() {
 			callback(err, {posts: posts});
+		}, 2500);
 	});
 };