Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix

public/src/forum/category.js

@@ -132,16 +132,16 @@ define(['composer'], function(composer) {
 		socket.emit('categories.loadMore', {
 			cid: cid,
 			after: $('#topics-container').children('.category-item').length
-		}, function (data) {
+		}, function (err, data) {
-			if (data.topics.length) {
+			if (!err && data.topics.length) {
 				Category.onTopicsLoaded(data.topics);
 			}
 			loadingMoreTopics = false;
 		});
 	}
 
-	function renderRecentReplies(posts) {
+	function renderRecentReplies(err, posts) {
-		if (!posts || posts.length === 0) {
+		if (err || !posts || posts.length === 0) {
 			return;
 		}
 

public/src/forum/topic.js

@@ -92,7 +92,7 @@ define(['composer'], function(composer) {
 
 					var loadingEl = document.getElementById('categories-loading');
 					if (loadingEl) {
-						socket.emit('categories.get', function(data) {
+						socket.emit('categories.get', function(err, data) {
 							// Render categories
 							var categoriesFrag = document.createDocumentFragment(),
 								categoryEl = document.createElement('li'),

src/socket.io/categories.js

@@ -3,17 +3,11 @@ var	categories = require('../categories'),
 	SocketCategories = {};
 
 SocketCategories.getRecentReplies = function(socket, tid, callback) {
-	categories.getRecentReplies(tid, socket.uid, 4, function(err, replies) {
+	categories.getRecentReplies(tid, socket.uid, 4, callback);
-		callback(replies);
-	});
 };
 
 SocketCategories.get = function(socket, data, callback) {
-	categories.getAllCategories(0, function(err, categories) {
+	categories.getAllCategories(0, callback);
-		if(callback) {
-			callback(categories);
-		}
-	});
 };
 
 SocketCategories.loadMore = function(socket, data, callback) {
@@ -21,7 +15,7 @@ SocketCategories.loadMore = function(socket, data, callback) {
 		end = start + 9;
 
 	categories.getCategoryTopics(data.cid, start, end, socket.uid, function(topics) {
-		callback({
+		callback(null, {
 			topics: topics
 		});
 	});

src/socket.io/index.js

@@ -134,7 +134,7 @@ Sockets.init = function() {
 		socket.on('*', function(payload, callback) {
 			function callMethod(method) {
 				method.call(null, socket, payload.args.length ? payload.args[0] : null, function(err, result) {
-					if(callback) {
+					if (callback) {
 						callback(err?{message:err.message}:null, result);
 					}
 				});