mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-08 06:55:46 +01:00
removed event:connect use socket.io connect event duh
This commit is contained in:
@@ -26,8 +26,6 @@ app.isConnected = false;
|
|||||||
setTimeout(socket.connect.bind(socket), parseInt(config.reconnectionDelay, 10) * 10);
|
setTimeout(socket.connect.bind(socket), parseInt(config.reconnectionDelay, 10) * 10);
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on('event:connect', onEventConnect);
|
|
||||||
|
|
||||||
socket.on('event:disconnect', onEventDisconnect);
|
socket.on('event:disconnect', onEventDisconnect);
|
||||||
|
|
||||||
socket.on('event:banned', onEventBanned);
|
socket.on('event:banned', onEventBanned);
|
||||||
@@ -37,6 +35,12 @@ app.isConnected = false;
|
|||||||
socket.on('event:alert', app.alert);
|
socket.on('event:alert', app.alert);
|
||||||
|
|
||||||
function onSocketConnect() {
|
function onSocketConnect() {
|
||||||
|
if (!reconnecting) {
|
||||||
|
app.showLoginMessage();
|
||||||
|
$(window).trigger('action:connected');
|
||||||
|
app.isConnected = true;
|
||||||
|
}
|
||||||
|
|
||||||
if (reconnecting) {
|
if (reconnecting) {
|
||||||
var reconnectEl = $('#reconnect');
|
var reconnectEl = $('#reconnect');
|
||||||
|
|
||||||
@@ -104,13 +108,6 @@ app.isConnected = false;
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function onEventConnect() {
|
|
||||||
app.showLoginMessage();
|
|
||||||
app.replaceSelfLinks();
|
|
||||||
$(window).trigger('action:connected');
|
|
||||||
app.isConnected = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
function onEventDisconnect() {
|
function onEventDisconnect() {
|
||||||
$(window).trigger('action:disconnected');
|
$(window).trigger('action:disconnected');
|
||||||
app.isConnected = false;
|
app.isConnected = false;
|
||||||
|
|||||||
@@ -71,14 +71,12 @@ function onConnect(socket) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
socket.emit('event:connect');
|
|
||||||
if (userData.status !== 'offline') {
|
if (userData.status !== 'offline') {
|
||||||
socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.status || 'online'});
|
socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.status || 'online'});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
rooms.enter(socket, 'online_guests');
|
rooms.enter(socket, 'online_guests');
|
||||||
socket.emit('event:connect');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user