You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/16 21:37:02 UTC
[1/2] incubator-nifi git commit: NIFI-143: - Using the datum from the
appropriate selection. - Handling group selection.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 575cc42c7 -> c2bb1fd5b
NIFI-143:
- Using the datum from the appropriate selection.
- Handling group selection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/15d7031e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/15d7031e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/15d7031e
Branch: refs/heads/develop
Commit: 15d7031ebda7faa6a2297ddf090c3ea0b17a32fb
Parents: a94cf4b
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Dec 16 15:34:39 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Dec 16 15:34:39 2014 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-process-group.js | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/15d7031e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
index a585fc8..0bd522c 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
@@ -164,12 +164,15 @@ nf.ProcessGroup = (function () {
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();
+ var drag = d3.select('rect.drag-selection');
+ if (!drag.empty()) {
+ // 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
- if (targetData.component.id !== selectionData.component.id) {
+ // ensure this group isn't in the selection
+ if (selection.empty()) {
// mark that we are hovering over a drop area if appropriate
target.classed('drop', function () {
// get the current selection and ensure its disconnected
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c2bb1fd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c2bb1fd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c2bb1fd5
Branch: refs/heads/develop
Commit: c2bb1fd5ba1ef4ef0e7c5b6f3b5fe6a1570947d9
Parents: 15d7031 575cc42
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Dec 16 15:35:44 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Dec 16 15:35:44 2014 -0500
----------------------------------------------------------------------
.../repository/VolatileContentRepository.java | 2 +-
.../resources/src/main/resources/bin/nifi.sh | 80 ++-
.../src/main/resources/conf/bootstrap.conf | 8 +-
.../java/org/apache/nifi/BootstrapListener.java | 46 +-
.../src/main/java/org/apache/nifi/NiFi.java | 2 -
.../apache/nifi/util/LimitingInputStream.java | 107 ++++
.../apache/nifi/bootstrap/BootstrapCodec.java | 7 +-
.../org/apache/nifi/bootstrap/NiFiListener.java | 18 +-
.../java/org/apache/nifi/bootstrap/RunNiFi.java | 496 ++++++++++++++++---
.../bootstrap/util/LimitingInputStream.java | 107 ++++
10 files changed, 749 insertions(+), 124 deletions(-)
----------------------------------------------------------------------