MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [widgets:multiline] Racecondition executing `init` and fetching 

d3.js twice
pull/5767/head
mokaddem 2020-03-26 14:13:01 +01:00
parent b903e6bd04
commit 8eff432fc5
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/View/Elements/dashboard/Widgets/MultiLineChart.ctp
View File

@ -10,14 +10,25 @@
<div id="chartContainer-<?= $seed ?>" style="flex-grow: 1; position:relative;"></div> <div id="chartContainer-<?= $seed ?>" style="flex-grow: 1; position:relative;"></div>
<script> <script>
if (typeof d3 === "undefined") { // load d3.js once. This is necessary as d3.js is using global variables for its event listeners (d3.mouse & d3.event) if (typeof d3 === "undefined") { // load d3.js once. This is necessary as d3.js is using global variables for its event listeners (d3.mouse & d3.event)
d3 = 'loading';
$.getScript("/js/d3.js", function() { $.getScript("/js/d3.js", function() {
init(); init<?= $seed ?>();
}) })
} else { // d3.js is already loaded } else { // d3.js is already loaded or is loading
init(); runInitWhenReady()
} }
function init() { // variables and functions have their own scope (no override) function runInitWhenReady() {
if (d3.version === undefined) { // d3.js not loaded yet
setTimeout(function() {
runInitWhenReady();
}, 50);
} else {
init<?= $seed ?>();
}
}
function init<?= $seed ?>() { // variables and functions have their own scope (no override)
'use strict'; 'use strict';
/** /**
@ -643,7 +654,7 @@ function init() { // variables and functions have their own scope (no override)
$('<span class="bold"></span>').text(xValueEnd) $('<span class="bold"></span>').text(xValueEnd)
) )
); );
var $table = $('<table class="table table-condensed"></table>').append( var $table = $('<table class="table table-condensed" style="margin-bottom: 0;"></table>').append(
$('<thead></thead>').append($('<tr></tr>').append( $('<thead></thead>').append($('<tr></tr>').append(
$('<th></th>').text('Name'), $('<th></th>').text('Name'),
$('<th></th>').text('Delta'), $('<th></th>').text('Delta'),