From c199075d98efcc82be512f6efda64b349dcb73e3 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Mon, 13 Mar 2017 20:20:41 -0700
Subject: [PATCH] Fix #5346
---
public/src/admin/general/dashboard.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js
index 363311c9f9..8adb9498ce 100644
--- a/public/src/admin/general/dashboard.js
+++ b/public/src/admin/general/dashboard.js
@@ -39,7 +39,6 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
Admin.init = function () {
app.enterRoom('admin');
- socket.emit('admin.rooms.getAll', Admin.updateRoomUsage);
isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
@@ -82,8 +81,10 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
$('[data-toggle="tooltip"]').tooltip();
setupRealtimeButton();
- setupGraphs();
- initiateDashboard();
+ setupGraphs(function () {
+ socket.emit('admin.rooms.getAll', Admin.updateRoomUsage);
+ initiateDashboard();
+ });
};
Admin.updateRoomUsage = function (err, data) {
@@ -161,7 +162,8 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
}
/* eslint-enable */
- function setupGraphs() {
+ function setupGraphs(callback) {
+ callback = callback || function () {};
var trafficCanvas = document.getElementById('analytics-traffic');
var registeredCanvas = document.getElementById('analytics-registered');
var presenceCanvas = document.getElementById('analytics-presence');
@@ -302,6 +304,8 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
}
updateTrafficGraph($(this).attr('data-units'), until);
});
+
+ callback();
});
}