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 2015/02/19 13:50:44 UTC
[1/3] incubator-nifi git commit: NIFI-325: - Ensuring empty selection
does enable the fill color dialog.
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 a3836d832 -> fac6cd7ac
NIFI-325:
- Ensuring empty selection does enable the fill color dialog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d76fe229
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d76fe229
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d76fe229
Branch: refs/heads/NIFI-250
Commit: d76fe229bb9eeead9a9daa541141588ab8b5d13a
Parents: 0047fa4
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 19 06:55:38 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 19 06:55:38 2015 -0500
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d76fe229/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
index 796ffdf..720a23e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
@@ -481,6 +481,10 @@ nf.CanvasUtils = (function () {
* @returns {boolean}
*/
isColorable: function(selection) {
+ if (selection.empty()) {
+ return false;
+ }
+
// determine if the current selection is entirely processors or labels
var selectedProcessors = selection.filter(function(d) {
return nf.CanvasUtils.isProcessor(d3.select(this));
[2/3] incubator-nifi git commit: NIFI-363: - Fixing 'Go to source'
and 'Go to destination' when the component in question is a remote process
group.
Posted by mc...@apache.org.
NIFI-363:
- Fixing 'Go to source' and 'Go to destination' when the component in question is a remote process group.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/57b5d589
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/57b5d589
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/57b5d589
Branch: refs/heads/NIFI-250
Commit: 57b5d589ad2c55394c2c96f53efd7e55a0e8c187
Parents: d76fe22
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 19 07:47:58 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 19 07:47:58 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-actions.js | 26 ++++++++++++++------
1 file changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/57b5d589/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index 0af6198..880d767 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -185,12 +185,17 @@ nf.Actions = (function () {
if (selection.size() === 1 && nf.CanvasUtils.isConnection(selection)) {
var selectionData = selection.datum();
- // if the source is actually in another group
- if (selectionData.component.source.groupId !== nf.Canvas.getGroupId()) {
- nf.CanvasUtils.showComponent(selectionData.component.source.groupId, selectionData.component.source.id);
- } else {
+ // the source is in the current group
+ if (selectionData.component.source.groupId === nf.Canvas.getGroupId()) {
var source = d3.select('#id-' + selectionData.component.source.id);
nf.Actions.show(source);
+ } else if (selectionData.component.source.type === 'REMOTE_OUTPUT_PORT') {
+ // if the source is remote
+ var remoteSource = d3.select('#id-' + selectionData.component.source.groupId);
+ nf.Actions.show(remoteSource);
+ } else {
+ // if the source is local but in a sub group
+ nf.CanvasUtils.showComponent(selectionData.component.source.groupId, selectionData.component.source.id);
}
}
},
@@ -204,12 +209,17 @@ nf.Actions = (function () {
if (selection.size() === 1 && nf.CanvasUtils.isConnection(selection)) {
var selectionData = selection.datum();
- // if the destination is actually in another group
- if (selectionData.component.destination.groupId !== nf.Canvas.getGroupId()) {
- nf.CanvasUtils.showComponent(selectionData.component.destination.groupId, selectionData.component.destination.id);
- } else {
+ // the destination is in the current group or its remote
+ if (selectionData.component.destination.groupId === nf.Canvas.getGroupId()) {
var destination = d3.select('#id-' + selectionData.component.destination.id);
nf.Actions.show(destination);
+ } else if (selectionData.component.destination.type === 'REMOTE_INPUT_PORT') {
+ // if the destination is remote
+ var remoteDestination = d3.select('#id-' + selectionData.component.destination.groupId);
+ nf.Actions.show(remoteDestination);
+ } else {
+ // if the destination is local but in a sub group
+ nf.CanvasUtils.showComponent(selectionData.component.destination.groupId, selectionData.component.destination.id);
}
}
},
[3/3] incubator-nifi git commit: Merge branch 'develop' into NIFI-250
Posted by mc...@apache.org.
Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fac6cd7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fac6cd7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fac6cd7a
Branch: refs/heads/NIFI-250
Commit: fac6cd7ac6dc1ed883a18369ebfbbde0886b11ec
Parents: a3836d8 57b5d58
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Feb 19 07:50:29 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 19 07:50:29 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-actions.js | 26 ++++++++++++++------
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 4 +++
2 files changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------