Merge branch 'master' of github.com:psychobunny/node-forum

v1.18.x
Julian Lam 12 years ago
commit 6a12ecf8e7

@ -13,8 +13,11 @@
var editLink = $('#editLink');
var followBtn = $('#follow-btn');
if( yourid !== theirid) {
if(yourid === "0") {
editLink.hide();
followBtn.hide();
}
else if(yourid !== theirid) {
editLink.hide();
if(isFollowing)
followBtn.hide();

@ -281,7 +281,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.on('api:user.follow', function(data) {
if(uid) {
user.follow(uid, data.uid, function(success) {
if(success) {
user.getUserField(data.uid, 'username', function(username) {
@ -294,10 +294,11 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
});
}
});
}
});
socket.on('api:user.unfollow', function(data) {
if(uid) {
user.unfollow(uid, data.uid, function(success) {
if(success) {
user.getUserField(data.uid, 'username', function(username) {
@ -310,6 +311,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
});
}
});
}
});
socket.on('api:topics.post', function(data) {

Loading…
Cancel
Save