Skip to content

Commit

Permalink
update libraries: fontawesome / dagrejs
Browse files Browse the repository at this point in the history 
- update fontawesome to 6.5.2
- update dagrejs to 1.0.4
  • Loading branch information
@sni
sni committed Jul 10, 2024
1 parent c027ea1 commit 4edc78a
Show file tree
Hide file tree
Showing 35 changed files with 895 additions and 80 deletions.
3 changes: 3 additions & 0 deletions Changes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ next:
- add percentage to availability queries
- BP:
- fix saving regex filter
- internals:
- update fontawesome to 6.5.2
- update dagrejs to 1.0.4

3.14.2 Sat Mar 23 19:21:39 CET 2024
- fix embedding 3rd party tools
Expand Down
32 changes: 16 additions & 16 deletions MANIFEST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ root/thruk/vendor/bestiejs-1.3.5/platform.js
root/thruk/vendor/bigscreen-2.0.4.js
root/thruk/vendor/billboard-3.5.1/billboard.css
root/thruk/vendor/billboard-3.5.1/billboard.pkgd.min.js
root/thruk/vendor/dagre-0.4.6/dagre.min.js
root/thruk/vendor/dagre-1.0.4/dagre.min.js
root/thruk/vendor/daterangepicker-3.0.5/daterangepicker.css
root/thruk/vendor/daterangepicker-3.0.5/daterangepicker.js
root/thruk/vendor/daterangepicker-3.0.5/moment.min.js
Expand Down Expand Up @@ -1592,21 +1592,21 @@ root/thruk/vendor/flot-d7c58b5/jquery.flot.symbol.js
root/thruk/vendor/flot-d7c58b5/jquery.flot.threshold.js
root/thruk/vendor/flot-d7c58b5/jquery.flot.time.js
root/thruk/vendor/flot-d7c58b5/LICENSE.txt
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/all.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/brands.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/fontawesome.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/regular.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/solid.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/v4-font-face.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/v4-shims.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/css/v5-font-face.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/LICENSE.txt
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/webfonts/fa-brands-400.ttf
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/webfonts/fa-brands-400.woff2
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/webfonts/fa-regular-400.ttf
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/webfonts/fa-regular-400.woff2
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/webfonts/fa-solid-900.ttf
root/thruk/vendor/fontawesome/fontawesome-free-6.1.0-web/webfonts/fa-solid-900.woff2
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/all.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/brands.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/fontawesome.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/regular.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/solid.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/v4-font-face.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/v4-shims.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/css/v5-font-face.min.css
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/LICENSE.txt
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/webfonts/fa-brands-400.ttf
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/webfonts/fa-brands-400.woff2
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/webfonts/fa-regular-400.ttf
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/webfonts/fa-regular-400.woff2
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/webfonts/fa-solid-900.ttf
root/thruk/vendor/fontawesome/fontawesome-free-6.5.2-web/webfonts/fa-solid-900.woff2
root/thruk/vendor/geoext2-2.0.2/src/GeoExt/data/LayerModel.js
root/thruk/vendor/geoext2-2.0.2/src/GeoExt/data/LayerStore.js
root/thruk/vendor/geoext2-2.0.2/src/GeoExt/panel/Map.js
Expand Down
39 changes: 23 additions & 16 deletions plugins/plugins-available/business_process/root/bp-3.14.2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1067,43 +1067,49 @@ function bp_get_node(id) {
}

/* do the layout */
var bp_graph_layout;
var bp_graph_layout = null;
function bp_render(containerId, nodes, edges) {
// first reset zoom
bp_zoom(1);
jQuery('#'+containerId).css("visibility", "hidden");
var g = new dagre.Digraph();
var g = new dagre.graphlib.Graph();
g.setGraph({
// https://github.com/dagrejs/dagre/wiki#configuring-the-layout
"nodesep": bp_graph_options.bp_nodeSep,
"edgesep": bp_graph_options.bp_edgeSep,
"ranksep": bp_graph_options.bp_rankSep,
"rankdir": bp_graph_options.bp_rankDir
})
g.setDefaultEdgeLabel(function() { return {}; });

jQuery.each(nodes, function(nr, n) {
g.addNode(n.id, { label: n.label, width: node_width, height: node_height });
g.setNode(n.id, { label: n.label, width: node_width, height: node_height });
});
jQuery.each(edges, function(nr, e) {
g.addEdge(null, e.sourceId, e.targetId);
g.setEdge(e.sourceId, e.targetId);
});

bp_graph_layout = null;
try {
bp_graph_layout = dagre.layout()
//.debugLevel(4)
.nodeSep(bp_graph_options.bp_nodeSep)
.edgeSep(bp_graph_options.bp_edgeSep)
.rankSep(bp_graph_options.bp_rankSep)
.rankDir(bp_graph_options.bp_rankDir)
.run(g);
dagre.layout(g);
bp_graph_layout = g;
} catch(e) {
var msg = '<span style="white-space: nowrap; color:red;">Please use Internet Explorer 9 or greater. Or preferable Firefox or Chrome.</span>';
if(thruk_debug_js) { msg += '<br><div style="width:500px; height: 400px; text-align: left;">Details:<br>'+e+'</div>'; }
jQuery('.bp_zoom_container').css('height','500px');
jQuery('#inner_'+containerId).html(msg);
jQuery('#'+containerId).css("visibility", "");
return;
}

bp_graph_layout.eachNode(function(u, value) {
g.nodes().forEach(function(id) {
// move node
jQuery('#'+u).css('left', (value.x-55)+'px').css('top', (value.y-15)+'px');
var n = g.node(id);
jQuery('#'+id).css('left', (n.x-55)+'px').css('top', (n.y-15)+'px');
});

bp_graph_layout.eachEdge(function(e, u, v, value) {
bp_plump('inner_'+containerId, u, v, value);
jQuery.each(edges, function(nr, e) {
bp_plump('inner_'+containerId, e.sourceId, e.targetId, g.edge(e.sourceId, e.targetId));
});

jQuery('#'+containerId).css("visibility", "");
Expand Down Expand Up @@ -1275,7 +1281,8 @@ function bp_redraw(evt) {

maxX = 0;
maxY = 0;
bp_graph_layout.eachNode(function(u, value) {
bp_graph_layout.nodes().forEach(function(id) {
var value = bp_graph_layout.node(id);
if(maxX < value.x) { maxX = value.x }
if(maxY < value.y) { maxY = value.y }
if(minY == -1 || value.y < minY) { minY = value.y; }
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugins-available/business_process/templates/_bp_frame.tt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[% PROCESS _header.tt css="plugins/${plugin_name}/bp-${fileversion}.css"
js=["plugins/${plugin_name}/bp-${fileversion}.js",
"vendor/dagre-0.4.6/dagre.min.js"
"vendor/dagre-1.0.4/dagre.min.js"
]
%]
[% PROCESS _message.tt %]
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugins-available/business_process/templates/bp_details.tt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[% PROCESS _header.tt css="plugins/${plugin_name}/bp-${fileversion}.css"
js=["plugins/${plugin_name}/bp-${fileversion}.js",
"vendor/dagre-0.4.6/dagre.min.js"
"vendor/dagre-1.0.4/dagre.min.js"
]
%]
[% PROCESS _message.tt %]
Expand Down
2 changes: 0 additions & 2 deletions root/thruk/vendor/dagre-0.4.6/dagre.min.js
View file

This file was deleted.

Loading

0 comments on commit 4edc78a

Please sign in to comment.