Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-05 05:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-03-15 10:01:00 -04:00
parent cb92ebb3be ff4c7ab3bb
commit 1ebbbdd3f9
24 changed files with 279 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/src/admin/general/dashboard.js
View File

@@ -81,7 +81,10 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
$('[data-toggle="tooltip"]').tooltip();
setupRealtimeButton();
setupGraphs();
setupGraphs(function () {
socket.emit('admin.rooms.getAll', Admin.updateRoomUsage);
initiateDashboard();
});
};
Admin.updateRoomUsage = function (err, data) {
@@ -159,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');
@@ -303,8 +307,12 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
$(this).addClass('active');
});
<<<<<<< HEAD
socket.emit('admin.rooms.getAll', Admin.updateRoomUsage);
initiateDashboard();
=======
callback();
>>>>>>> origin/master
});
}