Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-347: 

- Restoring the add connect image when stopping a drag event while still over the original source component and inside of where the source will become the destination (self loop).
This commit is contained in:
Matt Gilman 2015-02-12 12:33:59 -05:00
parent a416dfdb0f
commit a7eb1b7644
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connectable.js
View File

@ -122,19 +122,41 @@ nf.Connectable = (function () {
// stop further propagation // stop further propagation
d3.event.sourceEvent.stopPropagation(); d3.event.sourceEvent.stopPropagation();
// get the add connect img
var addConnect = d3.select(this);
// get the connector, if it the current point is not over a new destination // get the connector, if it the current point is not over a new destination
// the connector will be removed. otherwise it will be removed after the // the connector will be removed. otherwise it will be removed after the
// connection has been configured/cancelled // connection has been configured/cancelled
var connector = d3.select('path.connector'); var connector = d3.select('path.connector');
var connectorData = connector.datum();
// get the destination // get the destination
var destination = d3.select('g.connectable-destination'); var destination = d3.select('g.connectable-destination');
// we are not over a new destination // we are not over a new destination
if (destination.empty()) { if (destination.empty()) {
// get the source to determine if we are still over it
var source = d3.select('#id-' + connectorData.sourceId);
var sourceData = source.datum();
// get the mouse position relative to the source
var position = d3.mouse(source.node());
// if the position is outside the component, remove the add connect img
if (position[0] < 0 || position[0] > sourceData.dimensions.width || position[1] < 0 || position[1] > sourceData.dimensions.height) {
addConnect.remove();
} else {
// reset the add connect img by restoring the position and place in the DOM
addConnect.classed('dragging', false).attr('transform', function () {
return 'translate(' + d.origX + ', ' + d.origY + ')';
});
source.node().appendChild(this);
}
// remove the connector
connector.remove(); connector.remove();
} else { } else {
var connectorData = connector.datum();
var destinationData = destination.datum(); var destinationData = destination.datum();
// if this is a self loop we need to insert some bend points // if this is a self loop we need to insert some bend points
@ -149,12 +171,12 @@ nf.Connectable = (function () {
}); });
} }
// remove the add connect img
addConnect.remove();
// create the connection // create the connection
nf.ConnectionConfiguration.createConnection(connectorData.sourceId, destinationData.component.id); nf.ConnectionConfiguration.createConnection(connectorData.sourceId, destinationData.component.id);
} }
// remove this component
d3.select(this).remove();
}); });
}, },
@ -173,6 +195,10 @@ nf.Connectable = (function () {
var y = (d.dimensions.height / 2) - 14; var y = (d.dimensions.height / 2) - 14;
selection.append('image') selection.append('image')
.datum({
origX: x,
origY: y
})
.call(connect) .call(connect)
.call(nf.CanvasUtils.disableImageHref) .call(nf.CanvasUtils.disableImageHref)
.attr({ .attr({