tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the delete nodes.

Browse Source
This commit is contained in:
mdtrooper 2016-04-01 13:36:24 +02:00
parent 094c3d5cdb
commit 48ac039334
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/include/javascript/map/MapController.js
View File

@ -1840,7 +1840,7 @@ MapController.prototype.get_status_selection_node = function(id_node) {
var status = d3.select(self._target + " #node_" + id_node) var status = d3.select(self._target + " #node_" + id_node)
.attr("data-select"); .attr("data-select");
if (status == null) { if (status === null) {
return []; return [];
} }
else { else {
@ -2280,7 +2280,9 @@ MapController.prototype.deleteNode = function(self, target) {
arrowsToDelete.forEach(function(arrow) { arrowsToDelete.forEach(function(arrow) {
d3.select("#arrow_" + arrow).remove(); d3.select("#arrow_" + arrow).remove();
}); });
d3.select(self._target + " #" + id_node).remove(); d3.select(self._target + " #" + id_node).remove();
d3.select(self._target + " .minimap" + " #" + id_node).remove();
}); });
} }
@ -2290,28 +2292,41 @@ MapController.prototype.deleteNode = function(self, target) {
* This function delete the edges of a node in the edges array * This function delete the edges of a node in the edges array
*/ */
MapController.prototype.deleteEdgesAndNode = function(arrowsToDelete, id_node) { MapController.prototype.deleteEdgesAndNode = function(arrowsToDelete, id_node) {
var newEdges = []; var temp;
arrowsToDelete.forEach(function(arrow) { arrowsToDelete.forEach(function(arrow) {
temp = [];
edges.forEach(function(edge) { edges.forEach(function(edge) {
if (edge["graph_id"] != arrow) { if (edge["graph_id"] != arrow) {
newEdges.push(edge); temp.push(edge);
} }
}); });
edges = newEdges; edges = temp;
newEdges = [];
}); });
arrowsToDelete.forEach(function(arrow) { arrowsToDelete.forEach(function(arrow) {
temp = [];
nodes.forEach(function(nodeOrEdge) { nodes.forEach(function(nodeOrEdge) {
var nodeToDel = "node_" + nodeOrEdge["graph_id"]; var nodeToDel = "node_" + nodeOrEdge["graph_id"];
if ((nodeOrEdge["graph_id"] != arrow) && (nodeToDel != id_node)) { if ((nodeOrEdge["graph_id"] != arrow) && (nodeToDel != id_node)) {
newEdges.push(nodeOrEdge); temp.push(nodeOrEdge);
} }
}); });
nodes = newEdges; nodes = temp;
newEdges = [];
}); });
if (arrowsToDelete.length == 0) {
temp = [];
nodes.forEach(function(nodeOrEdge) {
var nodeToDel = "node_" + nodeOrEdge["graph_id"];
if (nodeToDel != id_node) {
temp.push(nodeOrEdge);
}
});
nodes = temp;
}
} }
/** /**