Merge branch 'master' into install_script

This commit is contained in:
Julian Lam
2013-05-27 11:45:58 -04:00
22 changed files with 555 additions and 251 deletions

View File

@@ -238,7 +238,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
});
socket.on('api:posts.edit', function(data) {
postTools.edit(uid, data.pid, data.content);
postTools.edit(uid, data.pid, data.title, data.content);
});
socket.on('api:posts.delete', function(data) {
@@ -265,10 +265,9 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
notifications.mark_read(nid, uid);
});
socket.on('api:topics.getRecentReplies', function(tid) {
console.log('test');
topics.getRecentReplies(tid, function(replies) {
socket.emit('api:topics.getRecentReplies', replies);
socket.on('api:categories.getRecentReplies', function(tid) {
categories.getRecentReplies(tid, function(replies) {
socket.emit('api:categories.getRecentReplies', replies);
});
});