m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagdalena GrodziƄska <mag.grodzinska@gmail.com>2020-01-11 17:50:27 +0100
committerGitHub <noreply@github.com>2020-01-11 17:50:27 +0100
commit2b8b0560346fe7e55c293550efb003d9bd25db98 (patch)
tree971790ed627a86d560cb7caa08eed7e856eb61ef
parent5de908b8a0e15c7d71dadf0f4314c12b1429ac6c (diff)
parent5c32df2a04f735176a76da09278e81d6042679a1 (diff)
Merge pull request #98 from m-chrzan/goddamn_js
Fix that goddamn js loading
-rw-r--r--src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html
index 841d995..bfb306c 100644
--- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html
+++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html
@@ -7,17 +7,16 @@
<link rel="preload" href="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js" as="script">
<link rel="preload" href="https://www.gstatic.com/charts/loader.js" as="script">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
- <script async type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
- <script async type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+ <script async defer type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+ <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<script type="text/javascript">
google.charts.load('current', {'packages':['corechart', 'table', 'controls', 'charteditor']});
- google.charts.setOnLoadCallback(refreshChart());
+ google.charts.setOnLoadCallback(refreshChart);
var chartState = [];
function refreshChart() {
- setTimeout(getData(), 500);
- setTimeout(getData(), 1500);
+ getData();
setInterval(getData, 5000);
}