Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-16 17:07:34 -05:00
parent 2893693d17
commit 7470c1bbd9
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/src/forum/home.js
View File

@@ -9,18 +9,27 @@ define(function() {
'user.getActiveUsers' 'user.getActiveUsers'
]); ]);
socket.emit('user.count', function(data) { socket.emit('user.count', updateUserCount);
$('#stats_users').html(utils.makeNumberHumanReadable(data.count)).attr('title', data.count); socket.on('user.count', updateUserCount);
});
socket.emit('meta.getUsageStats', function(data) { function updateUserCount(err, data) {
$('#stats_users').html(utils.makeNumberHumanReadable(data.count)).attr('title', data.count);
}
socket.emit('meta.getUsageStats', updateUsageStats);
socket.on('meta.getUsageStats', updateUsageStats);
function updateUsageStats(err, data) {
$('#stats_topics').html(utils.makeNumberHumanReadable(data.topics)).attr('title', data.topics); $('#stats_topics').html(utils.makeNumberHumanReadable(data.topics)).attr('title', data.topics);
$('#stats_posts').html(utils.makeNumberHumanReadable(data.posts)).attr('title', data.posts); $('#stats_posts').html(utils.makeNumberHumanReadable(data.posts)).attr('title', data.posts);
}); }
socket.emit('user.getActiveUsers', function(data) { socket.emit('user.getActiveUsers', updateActiveUsers);
socket.on('user.getActiveUsers', updateActiveUsers);
function updateActiveUsers(err, data) {
$('#stats_online').html(data.users); $('#stats_online').html(data.users);
}); }
} }
return home; return home;

14
src/socket.io/index.js
View File

@@ -139,8 +139,8 @@ Sockets.init = function() {
} }
}); });
} }
console.log('derp');
console.log(payload, callback);
var parts = payload.name.split('.'), var parts = payload.name.split('.'),
namespace = parts.slice(0, 1), namespace = parts.slice(0, 1),
methodToCall = parts.reduce(function(prev, cur) { methodToCall = parts.reduce(function(prev, cur) {
@@ -182,7 +182,7 @@ Sockets.logoutUser = function(uid) {
Sockets.emitUserCount = function() { Sockets.emitUserCount = function() {
db.getObjectField('global', 'userCount', function(err, count) { db.getObjectField('global', 'userCount', function(err, count) {
io.sockets.emit('user.count', { io.sockets.emit('user.count', err?{message:err.message}:null, {
count: count count: count
}); });
}); });
@@ -261,9 +261,9 @@ function emitTopicPostStats(callback) {
}; };
if (!callback) { if (!callback) {
io.sockets.emit('post.stats', stats); io.sockets.emit('post.stats', null, stats);
} else { } else {
callback(stats); callback(null, stats);
} }
}); });
} }
@@ -282,9 +282,9 @@ function emitOnlineUserCount(callback) {
}; };
if (callback) { if (callback) {
callback(returnObj); callback(null, returnObj);
} else { } else {
io.sockets.emit('user.active.get', returnObj); io.sockets.emit('user.getActiveUsers', null, returnObj);
} }
} }

4
src/user.js
View File

@@ -673,10 +673,10 @@ var bcrypt = require('bcrypt'),
User.count = function(callback) { User.count = function(callback) {
db.getObjectField('global', 'userCount', function(err, count) { db.getObjectField('global', 'userCount', function(err, count) {
if(err) { if(err) {
return; return callback(err);
} }
callback({ callback(null, {
count: count ? count : 0 count: count ? count : 0
}); });
}); });