|
|
@ -130,11 +130,7 @@ app.cacheBuster = null;
|
|
|
|
|
|
|
|
|
|
|
|
app.enterRoom = function (room, callback) {
|
|
|
|
app.enterRoom = function (room, callback) {
|
|
|
|
callback = callback || function() {};
|
|
|
|
callback = callback || function() {};
|
|
|
|
if (socket) {
|
|
|
|
if (socket && app.user.uid && app.currentRoom !== room) {
|
|
|
|
if (app.currentRoom === room) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
socket.emit('meta.rooms.enter', {
|
|
|
|
socket.emit('meta.rooms.enter', {
|
|
|
|
enter: room,
|
|
|
|
enter: room,
|
|
|
|
username: app.user.username,
|
|
|
|
username: app.user.username,
|
|
|
@ -148,6 +144,7 @@ app.cacheBuster = null;
|
|
|
|
return app.alertError(err.message);
|
|
|
|
return app.alertError(err.message);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
app.currentRoom = room;
|
|
|
|
app.currentRoom = room;
|
|
|
|
|
|
|
|
callback();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|