Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix room enter

Browse Source
This commit is contained in:
barisusakli
2015-05-15 00:02:59 -04:00
parent d9af2242a7
commit 30a9b66b31
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/app.js
View File

@@ -184,6 +184,7 @@ app.cacheBuster = null;
}, function(err) { }, function(err) {
if (err) { if (err) {
app.alertError(err.message); app.alertError(err.message);
return;
} }
app.currentRoom = room; app.currentRoom = room;
}); });

3
src/socket.io/meta.js
View File

@@ -52,7 +52,7 @@ SocketMeta.buildTitle = function(socket, text, callback) {
SocketMeta.rooms.enter = function(socket, data, callback) { SocketMeta.rooms.enter = function(socket, data, callback) {
if (!socket.uid) { if (!socket.uid) {
return; return callback();
} }
if (!data) { if (!data) {
@@ -83,6 +83,7 @@ SocketMeta.rooms.enter = function(socket, data, callback) {
websockets.in(data.enter).emit('event:user_enter', data); websockets.in(data.enter).emit('event:user_enter', data);
} }
} }
callback();
}; };
SocketMeta.rooms.getAll = function(socket, data, callback) { SocketMeta.rooms.getAll = function(socket, data, callback) {