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

New maps in progress... (Fixed "delete modules" and "delete modulegroups" when "show modules" and "show module groups" are enable

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-04-18 10:45:34 +02:00
parent 89c2d16159
commit bc0cd7f570
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,6 +568,11 @@ MapController.prototype.event_toggle_minimap = function() {
} }
} }
/**
* Function get_real_size_map
* Return [width, height]
* This function returns the real map size
*/
MapController.prototype.get_real_size_map = function() { MapController.prototype.get_real_size_map = function() {
var self = this; var self = this;
@ -1511,7 +1516,6 @@ MapController.prototype.events_for_nodes = function(id_node) {
var node_menu = self.get_menu_nodes(); var node_menu = self.get_menu_nodes();
d3.selectAll(selector) d3.selectAll(selector)
.on("mouseover", function(d) { .on("mouseover", function(d) {
if (!self._dragging) { if (!self._dragging) {
@ -1741,9 +1745,29 @@ MapController.prototype.is_delety = function(node) {
case ITEM_TYPE_FICTIONAL_NODE: case ITEM_TYPE_FICTIONAL_NODE:
return_var = true; return_var = true;
break; break;
case ITEM_TYPE_MODULE_NETWORKMAP:
if (filter['show_modules']) {
return_var = true;
}
else {
return_var = false;
}
break;
case ITEM_TYPE_MODULEGROUP_NETWORKMAP:
if (filter['show_modules']) {
if (filter['show_module_group']) {
return_var = true;
}
else {
return_var = false;
}
}
else {
return_var = false;
}
break;
} }
return return_var; return return_var;
} }
@ -2603,7 +2627,7 @@ 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(); d3.select(self._target + " .minimap" + " #" + id_node).remove();
}); });