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

Working in the selected nodes and dragging.

Browse Source
This commit is contained in:
mdtrooper 2016-03-29 13:33:50 +02:00
parent ae53eea7ab
commit 090563a119
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1391,7 +1391,10 @@ MapController.prototype.init_events = function(principalObject) {
self.select_node(d['graph_id'], "over"); self.select_node(d['graph_id'], "over");
}) })
.on("mouseout", function(d) { .on("mouseout", function(d) {
self.select_node(d['graph_id'], "off"); if (self.last_event != "drag")
self.select_node(d['graph_id'], "off");
self.last_event = null;
}) })
.on("click", function(d) { .on("click", function(d) {
if (d3.event.button != 0) { if (d3.event.button != 0) {
@ -1466,7 +1469,6 @@ MapController.prototype.init_events = function(principalObject) {
var status_selection = self.get_status_selection_node(d['graph_id']); var status_selection = self.get_status_selection_node(d['graph_id']);
if (status_selection.indexOf("select") == -1) { if (status_selection.indexOf("select") == -1) {
console.log("self.remove_selection_nodes");
self.remove_selection_nodes(); self.remove_selection_nodes();
} }
@ -1481,6 +1483,7 @@ MapController.prototype.init_events = function(principalObject) {
var delta_x = d3.event.dx; var delta_x = d3.event.dx;
var delta_y = d3.event.dy; var delta_y = d3.event.dy;
self.last_event = "drag";
$.each(nodes, function(i, node) { $.each(nodes, function(i, node) {
if (node.type != ITEM_TYPE_AGENT_NETWORKMAP) if (node.type != ITEM_TYPE_AGENT_NETWORKMAP)