Some fixes in the creation relationships.
This commit is contained in:
parent
bf59e5b17b
commit
2f122f89a7
|
@ -1344,14 +1344,9 @@ MapController.prototype.key_is_pressed = function(key) {
|
|||
return self._keys_pressed[key];
|
||||
}
|
||||
|
||||
MapController.prototype.events_for_nodes = function(id_node) {
|
||||
MapController.prototype.get_menu_nodes = function() {
|
||||
var self = this;
|
||||
|
||||
var selector = ".node";
|
||||
if (typeof(id_node) != "undefined") {
|
||||
selector = "#node_" + id_node;
|
||||
}
|
||||
|
||||
var node_menu = [
|
||||
{
|
||||
title: 'Show details',
|
||||
|
@ -1399,6 +1394,20 @@ MapController.prototype.events_for_nodes = function(id_node) {
|
|||
}
|
||||
];
|
||||
|
||||
return node_menu;
|
||||
}
|
||||
|
||||
MapController.prototype.events_for_nodes = function(id_node) {
|
||||
var self = this;
|
||||
|
||||
var selector = ".node";
|
||||
if (typeof(id_node) != "undefined") {
|
||||
selector = "#node_" + id_node;
|
||||
}
|
||||
|
||||
var node_menu = self.get_menu_nodes();
|
||||
|
||||
|
||||
d3.selectAll(selector)
|
||||
.on("mouseover", function(d) {
|
||||
if (!self._dragging)
|
||||
|
@ -1813,6 +1822,7 @@ MapController.prototype.start_relationship_nodes = function(type) {
|
|||
}
|
||||
|
||||
self._relationship_in_progress = true;
|
||||
self._dragging = false;
|
||||
self.show_temp_arrows(node, type);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -578,8 +578,10 @@ NetworkmapController.prototype.arrow_by_pieces = function (target, arrow_data, w
|
|||
}
|
||||
|
||||
if (arrow_data['temp']) {
|
||||
MapController.prototype.arrow_by_pieces.call(
|
||||
this, target, arrow_data, wait);
|
||||
self.arrow_by_pieces_AA(
|
||||
self._target + " svg", arrow_data, wait);
|
||||
//~ MapController.prototype.arrow_by_pieces.call(
|
||||
//~ this, target, arrow_data, wait);
|
||||
}
|
||||
else {
|
||||
switch (arrow_data['type']) {
|
||||
|
@ -1928,6 +1930,51 @@ NetworkmapController.prototype.getArrows = function(id_node) {
|
|||
return return_var;
|
||||
}
|
||||
|
||||
NetworkmapController.prototype.get_menu_nodes = function() {
|
||||
var self = this;
|
||||
|
||||
var node_menu = [
|
||||
{
|
||||
title: 'Show details',
|
||||
action: function(elm, d, i) {
|
||||
var nodeTarget = $(elm);
|
||||
var type = parseInt(nodeTarget.data("type"));
|
||||
if (type == 0) {
|
||||
self.nodeGetDetails(self, elm);
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
title: 'Resize',
|
||||
action: function(elm, d, i) {
|
||||
self.paint_resize_square(d);
|
||||
}
|
||||
},
|
||||
{
|
||||
title: 'Edit',
|
||||
action: function(elm, d, i) {
|
||||
self.editNode(self, elm);
|
||||
}
|
||||
},
|
||||
{
|
||||
title: 'Relationship with other',
|
||||
action: function(elm, d, i) {
|
||||
self._last_event = null;
|
||||
self._relationship_in_progress_type = "children";
|
||||
self.set_as_children();
|
||||
}
|
||||
},
|
||||
{
|
||||
title: 'Delete',
|
||||
action: function(elm, d, i) {
|
||||
self.deleteNode(self, elm);
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
return node_menu;
|
||||
}
|
||||
|
||||
|
||||
function update_node(data_graph_id) {
|
||||
node_id = "node_" + data_graph_id;
|
||||
|
|
Loading…
Reference in New Issue