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

Merge remote branch 'origin/develop' into develop

This commit is contained in:
joewitt 2014-12-16 21:21:08 -05:00
parent fdce4f5b1a c2bb1fd5ba
commit 1b23671eb3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,12 +164,15 @@ nf.ProcessGroup = (function () {
var targetData = target.datum(); var targetData = target.datum();
// see if there is a selection being dragged // see if there is a selection being dragged
var selection = d3.select('rect.drag-selection'); var drag = d3.select('rect.drag-selection');
if (!selection.empty()) { if (!drag.empty()) {
var selectionData = selection.datum(); // filter the current selection by this group
var selection = nf.CanvasUtils.getSelection().filter(function(d) {
return targetData.component.id === d.component.id;
});
// ensure what is being dragged isn't the target // ensure this group isn't in the selection
if (targetData.component.id !== selectionData.component.id) { if (selection.empty()) {
// mark that we are hovering over a drop area if appropriate // mark that we are hovering over a drop area if appropriate
target.classed('drop', function () { target.classed('drop', function () {
// get the current selection and ensure its disconnected // get the current selection and ensure its disconnected