notifications socket callbacks

public/src/modules/notifications.js

@@ -11,14 +11,14 @@ define(function() {
 		notifTrigger.addEventListener('click', function(e) {
 			e.preventDefault();
 			if (notifContainer.className.indexOf('open') === -1) {
-				socket.emit('notifications.get', null, function(data) {
+				socket.emit('notifications.get', null, function(err, data) {
 					var notifFrag = document.createDocumentFragment(),
 						notifEl = document.createElement('li'),
 						numRead = data.read.length,
 						numUnread = data.unread.length,
 						x;
 					notifList.innerHTML = '';
-					if ((data.read.length + data.unread.length) > 0) {
+					if (!err && (data.read.length + data.unread.length) > 0) {
 						for (x = 0; x < numUnread; x++) {
 							notifEl.setAttribute('data-nid', data.unread[x].nid);
 							notifEl.className = 'unread';

src/socket.io/notifications.js

@@ -1,17 +1,15 @@
+"use strict";
+
 var	user = require('../user'),
 
 	SocketNotifs = {};
 
 SocketNotifs.get = function(socket, data, callback) {
-	user.notifications.get(socket.uid, function(notifs) {
+	user.notifications.get(socket.uid, callback);
-		callback(notifs);
-	});
 };
 
 SocketNotifs.getCount = function(socket, data, callback) {
-	user.notifications.getUnreadCount(socket.uid, function(err, count) {
+	user.notifications.getUnreadCount(socket.uid, callback);
-		callback(err ? err.message : null, count);
-	});
 };
 
 module.exports = SocketNotifs;

src/user.js

@@ -1016,7 +1016,7 @@ var bcrypt = require('bcrypt'),
 					notifications.read.length = maxNotifs - notifications.unread.length;
 				}
 
-				callback(notifications);
+				callback(err, notifications);
 			});
 		},
 		getAll: function(uid, limit, before, callback) {