Fixed "hi is not a function" resulting from a google chart loader update to v44 (see https://groups.google.com/forum/#!topic/google-visualization-api/tdswEASPEKA)

pull/1/head
Heiner Peuser 2016-02-28 20:27:49 +01:00
rodzic 8d1a081404
commit 6bf525f98b
2 zmienionych plików z 11 dodań i 6 usunięć

Wyświetl plik

@ -95,9 +95,9 @@
Developed by <a href="https://weweave.net">weweave</a>. Source available on <a href="https://github.com/weweave/docker-container-stats">GitHub</a>.
</footer>
</div>
<script src="js/jquery-2.2.1.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/jquery-2.2.1.min.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<script src="js/script.js"></script>
<script type="text/javascript" src="js/script.js"></script>
</body>
</html>

Wyświetl plik

@ -51,6 +51,7 @@
};
var renderChart = function(elementId, containerId, chart) {
console.log('Rendering chart '+chart+' for container ' + containerId);
var url;
if (containerId) {
url = './rs/container/'+containerId+'/'+chart+'/'+zoom;
@ -75,6 +76,7 @@
};
var renderContainerStats = function(id) {
console.log('Rendering stats for container ' + id);
renderLatestStats(id);
renderChart('mem-chart', id, 'mem');
renderChart('net-in-chart', id, 'net_in');
@ -92,6 +94,7 @@
};
var renderAllContainerStats = function() {
console.log('Rendering all container stats');
renderChart('mem-chart', null, 'mem');
renderChart('net-in-chart', null, 'net_in');
renderChart('net-out-chart', null, 'net_out');
@ -124,7 +127,7 @@
list.append(tr);
};
var loadContainerList = function() {
var loadContainerList = function(cb) {
$.get('./rs/containers/get', function(data) {
var list = $('#container-list > tbody');
for (var i=0; i<data.length; i++) {
@ -149,10 +152,12 @@
};
var init = function() {
google.charts.load('current', {packages: ['corechart']});
initZoomButton();
loadContainerList();
google.charts.setOnLoadCallback(renderAllContainerStats);
google.charts.load('44', {
packages: ['corechart'],
callback: renderAllContainerStats
});
};
$(document).ready(init);