CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

chg: [d3] get last D3 js version

relationships
terrtia 2024-05-28 15:50:51 +02:00
parent c1a2bc7eb8
commit 79d39c812a
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/www/templates/correlation/show_relationship.html
View File

@ -16,8 +16,7 @@
<script src="{{ url_for('static', filename='js/helper.js')}}"></script> <script src="{{ url_for('static', filename='js/helper.js')}}"></script>
<script src="{{ url_for('static', filename='js/popper.min.js')}}"></script> <script src="{{ url_for('static', filename='js/popper.min.js')}}"></script>
<script src="{{ url_for('static', filename='js/bootstrap4.min.js')}}"></script> <script src="{{ url_for('static', filename='js/bootstrap4.min.js')}}"></script>
<!--<script src="{{ url_for('static', filename='js/d3.min.js') }}"></script>--> <script src="{{ url_for('static', filename='js/d3.v7.min.js') }}"></script>
<script src="https://d3js.org/d3.v6.min.js"></script>
<style> <style>
.icon_legend { .icon_legend {
@ -613,14 +612,14 @@ d3.json(url)
} }
//// ----------------------------------------------------------------------------------------------------------------------------- //// --------------------------------------------------------------------------------------------------------
}) })
.catch(function(error) { .catch(function(error) {
$("#graph_loading").remove() $("#graph_loading").remove()
svg_node.remove(); svg_node.remove();
d3.select("#graph").append("div") d3.select("#graph").append("div")
.text(error); .text(error);
}); });
} }
@ -681,7 +680,7 @@ if (d.popover) {
blur_tooltip(); blur_tooltip();
} else { } else {
var pop_header = "<div class=\"card text-white\" style=\"max-width: 25rem;\"><div class=\"card-header bg-dark pb-0 border-white\"><h6>" let pop_header = "<div class=\"card text-white\" style=\"max-width: 25rem;\"><div class=\"card-header bg-dark pb-0 border-white\"><h6>"
if (obj_label) { if (obj_label) {
pop_header = pop_header + sanitize_text(obj_label) pop_header = pop_header + sanitize_text(obj_label)
} else if (obj_gid) { } else if (obj_gid) {
@ -690,7 +689,7 @@ if (d.popover) {
pop_header = pop_header + sanitize_text(d.text) pop_header = pop_header + sanitize_text(d.text)
} }
pop_header = pop_header + "</h6></div>" pop_header = pop_header + "</h6></div>"
var spinner = "<div class=\"card-body bg-dark pt-0\"><div class=\"spinner-border text-warning\" role=\"status\"></div> Loading...</div>" let spinner = "<div class=\"card-body bg-dark pt-0\"><div class=\"spinner-border text-warning\" role=\"status\"></div> Loading...</div>"
div.html(pop_header + spinner) div.html(pop_header + spinner)
.style("left", (d3_pageX) + "px") .style("left", (d3_pageX) + "px")
@ -709,7 +708,7 @@ if (d.popover) {
$.getJSON(description_url, $.getJSON(description_url,
function(data){ function(data){
var desc = pop_header + "<div class=\"card-body bg-dark pb-1 pt-2\"><dl class=\"row py-0 my-0\">" let desc = pop_header + "<div class=\"card-body bg-dark pb-1 pt-2\"><dl class=\"row py-0 my-0\">"
Object.keys(data).forEach(function(key) { Object.keys(data).forEach(function(key) {
if (key=="status") { if (key=="status") {
desc = desc + "<dt class=\"col-sm-3 px-0\">status</dt><dd class=\"col-sm-9 px-0\"><div class=\"badge badge-pill badge-light flex-row-reverse\" style=\"color:" desc = desc + "<dt class=\"col-sm-3 px-0\">status</dt><dd class=\"col-sm-9 px-0\"><div class=\"badge badge-pill badge-light flex-row-reverse\" style=\"color:"
@ -783,7 +782,6 @@ if (d.popover) {
function mouseouted() { function mouseouted() {
currentObject = null; currentObject = null;
div.transition() div.transition()
.duration(500) .duration(500)
.style("opacity", 0); .style("opacity", 0);

2
var/www/update_thirdparty.sh
View File

@ -9,7 +9,9 @@ wget -q http://dygraphs.com/dygraph-combined.js -O ./static/js/dygraph-combined.
BOOTSTRAP_VERSION='4.2.1' BOOTSTRAP_VERSION='4.2.1'
FONT_AWESOME_VERSION='5.7.1' FONT_AWESOME_VERSION='5.7.1'
D3_JS_VERSION='5.16.0' D3_JS_VERSION='5.16.0'
wget https://d3js.org/d3.v7.min.js -O ./static/js/d3.v7.min.js
rm -rf temp rm -rf temp
mkdir temp mkdir temp