From fddeb5c0f8062a029b746bc68bde2b39f25cfccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 6 Sep 2020 21:51:45 -0400 Subject: [PATCH] feat: remove app.isConnected, use socket.connected --- public/src/admin/dashboard.js | 2 +- public/src/sockets.js | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js index 780f705bb14a..5f0fe60a6842 100644 --- a/public/src/admin/dashboard.js +++ b/public/src/admin/dashboard.js @@ -556,7 +556,7 @@ define('admin/dashboard', ['semver', 'Chart', 'translator', 'benchpress'], funct clearInterval(intervals.graphs); intervals.rooms = setInterval(function () { - if (app.isFocused && app.isConnected) { + if (app.isFocused && socket.connected) { socket.emit('admin.rooms.getAll', Admin.updateRoomUsage); } }, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.roomInterval); diff --git a/public/src/sockets.js b/public/src/sockets.js index d25bb73b6d3e..f28d20cec81b 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -3,7 +3,6 @@ app = window.app || {}; socket = window.socket; -app.isConnected = false; (function () { var reconnecting = false; @@ -76,8 +75,6 @@ app.isConnected = false; } function onConnect() { - app.isConnected = true; - if (!reconnecting) { app.showMessages(); $(window).trigger('action:connected'); @@ -155,7 +152,6 @@ app.isConnected = false; function onDisconnect() { $(window).trigger('action:disconnected'); - app.isConnected = false; } function onEventBanned(data) {