Merge branch 'master' of github.com:designcreateplay/NodeBB

This commit is contained in:
Julian Lam
2013-08-28 16:33:09 -04:00
91 changed files with 9249 additions and 9261 deletions

View File

@@ -217,9 +217,11 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
});
socket.on('user.exists', function(data) {
user.exists(utils.slugify(data.username), function(exists){
socket.emit('user.exists', {exists: exists});
});
if(data.username) {
user.exists(utils.slugify(data.username), function(exists){
socket.emit('user.exists', {exists: exists});
});
}
});
socket.on('user.count', function(data) {
@@ -361,7 +363,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.emit('event:alert', {
title: 'Thank you for posting',
message: 'You have successfully posted. Click here to view your post.',
type: 'notify',
type: 'warning',
timeout: 2000
});
}
@@ -384,7 +386,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.emit('event:alert', {
title: 'Reply Unsuccessful',
message: 'You don't seem to be logged in, so you cannot reply.',
type: 'error',
type: 'danger',
timeout: 2000
});
return;
@@ -400,7 +402,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.emit('event:alert', {
title: 'Reply Unsuccessful',
message: 'Your reply could not be posted at this time. Please try again later.',
type: 'notify',
type: 'warning',
timeout: 2000
});
}
@@ -414,7 +416,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.emit('event:alert', {
title: 'Reply Successful',
message: 'You have successfully replied. Click here to view your reply.',
type: 'notify',
type: 'warning',
timeout: 2000
});