server: Update socket.io use for new upstream version.
This commit is contained in:
parent
1bc218b26d
commit
d732362599
1 changed files with 12 additions and 9 deletions
|
|
@ -911,8 +911,11 @@ var server = http.createServer(function(request, response) {
|
|||
});
|
||||
});
|
||||
|
||||
var io = socketio(server);
|
||||
io.set('origins', '*:*');
|
||||
var io = socketio(server, {
|
||||
'cors': {
|
||||
'origin': '*:*',
|
||||
}
|
||||
});
|
||||
|
||||
io.on('connection', function(socket) {
|
||||
var query = socket.handshake.query;
|
||||
|
|
@ -1007,13 +1010,13 @@ io.on('connection', function(socket) {
|
|||
room.sendMessage(socket, message);
|
||||
});
|
||||
|
||||
socket.join(room_id, function() {
|
||||
var displayname = decoded.displayname || null;
|
||||
var permissions = decoded.permissions || null;
|
||||
room.addUser(socket, {
|
||||
'displayname': displayname,
|
||||
'permissions': permissions
|
||||
});
|
||||
socket.join(room_id);
|
||||
|
||||
var displayname = decoded.displayname || null;
|
||||
var permissions = decoded.permissions || null;
|
||||
room.addUser(socket, {
|
||||
'displayname': displayname,
|
||||
'permissions': permissions
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue