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

Working in the context menu and several nodes selected.

Browse Source
This commit is contained in:
mdtrooper 2016-03-30 15:49:17 +02:00
parent 3e399356d3
commit 7d66ba2dde
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1404,8 +1404,14 @@ 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) {
if (self.last_event != "drag") if (self.last_event != "drag") {
var status_selection = self.get_status_selection_node(d['graph_id']);
self.select_node(d['graph_id'], "off"); self.select_node(d['graph_id'], "off");
if (status_selection.indexOf("select") != -1) {
self.select_node(d['graph_id'], "select");
}
}
self.last_event = null; self.last_event = null;
}) })
@ -1419,7 +1425,10 @@ MapController.prototype.init_events = function(principalObject) {
self.tooltip_map_create(self, this); self.tooltip_map_create(self, this);
}) })
.on("contextmenu", d3.contextMenu(node_menu)); .on("contextmenu", d3.contextMenu(node_menu, function(node) {
self._last_event = "contextmenu";
self.select_node(node['graph_id'], "select");
}));
var drag = d3.behavior.drag() var drag = d3.behavior.drag()
.origin(function(d) { return d; }) .origin(function(d) { return d; })
@ -1533,13 +1542,17 @@ MapController.prototype.init_events = function(principalObject) {
* Return void * Return void
*/ */
function dragended(d) { function dragended(d) {
self.select_node(d['graph_id'], "off"); if (self._last_event != "contextmenu") {
self._last_event = null;
if ($("#node_" + d['graph_id']).hasClass("tooltipstered")) {
$("#node_" + d['graph_id']).tooltipster('destroy'); self.select_node(d['graph_id'], "off");
if ($("#node_" + d['graph_id']).hasClass("tooltipstered")) {
$("#node_" + d['graph_id']).tooltipster('destroy');
}
self.remove_resize_square();
} }
self.remove_resize_square();
} }
} }