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

NIFI-143: 

- Added a check to ensure that a process does not attempt to drop on itself.
This commit is contained in:
Matt Gilman 2014-12-09 08:17:31 -05:00
parent 4d998c12c9
commit c3ba275c63
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
View File

@ -148,24 +148,35 @@ nf.ProcessGroup = (function () {
// always support selecting and navigation
processGroup.on('dblclick', function (d) {
// enter this group on double click
nf.CanvasUtils.enterGroup(d.component.id);
})
// enter this group on double click
nf.CanvasUtils.enterGroup(d.component.id);
})
.call(nf.Selectable.activate).call(nf.ContextMenu.activate);
// only support dragging, connection, and drag and drop if appropriate
if (nf.Common.isDFM()) {
processGroup
//Using mouseover/out to workaround chrom issue #122746
// Using mouseover/out to workaround chrome issue #122746
.on('mouseover.drop', function (d) {
// get the target and ensure its not already been marked for drop
var target = d3.select(this);
//mark that we are hovering over a drop area if appropriate
if (!target.classed('drop') && !d3.select('rect.drag-selection').empty()) {
target.classed('drop', function () {
//get the current selection and ensure its disconnected
return nf.CanvasUtils.isDisconnected(nf.CanvasUtils.getSelection());
});
if (!target.classed('drop')) {
var targetData = target.datum();
// see if there is a selection being dragged
var selection = d3.select('rect.drag-selection');
if (!selection.empty()) {
var selectionData = selection.datum();
// ensure what is being dragged isn't the target
if (targetData.component.id !== selectionData.component.id) {
// mark that we are hovering over a drop area if appropriate
target.classed('drop', function () {
// get the current selection and ensure its disconnected
return nf.CanvasUtils.isDisconnected(nf.CanvasUtils.getSelection());
});
}
}
}
})
.on('mouseout.drop', function (d) {