You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2016/09/21 21:21:12 UTC
nifi git commit: NIFI-2707: - Ensuring that connections are always
sorted accordingly to their zIndex. This preserves the 'bring to front'
settings.
Repository: nifi
Updated Branches:
refs/heads/master b304f70f3 -> 5198e70d1
NIFI-2707: - Ensuring that connections are always sorted accordingly to their zIndex. This preserves the 'bring to front' settings.
This closes #1023.
Signed-off-by: Bryan Bende <bb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5198e70d
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5198e70d
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5198e70d
Branch: refs/heads/master
Commit: 5198e70d1460134689c11f6bbbc6147b4292fb0b
Parents: b304f70
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Sep 15 12:53:24 2016 -0400
Committer: Bryan Bende <bb...@apache.org>
Committed: Wed Sep 21 17:20:44 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-actions.js | 2 --
.../src/main/webapp/js/nf/canvas/nf-connection.js | 11 ++---------
2 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/5198e70d/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index 9f9c460..52e24aa 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -1450,9 +1450,7 @@ nf.Actions = (function () {
dataType: 'json',
contentType: 'application/json'
}).done(function (response) {
- // update the edge's zIndex
nf.Connection.set(response);
- nf.Connection.reorder();
});
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/5198e70d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
index 4242c69..a64dc3f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
@@ -1579,7 +1579,7 @@ nf.Connection = (function () {
selection.call(updateConnections, {
'updatePath': true,
'updateLabel': false
- });
+ }).call(sort);
},
/**
@@ -1634,18 +1634,11 @@ nf.Connection = (function () {
'updatePath': true,
'updateLabel': true,
'transition': transition
- });
+ }).call(sort);
selection.exit().call(removeConnections);
},
/**
- * Reorders the connections based on their current z index.
- */
- reorder: function () {
- d3.selectAll('g.connection').call(sort);
- },
-
- /**
* Refreshes the connection in the UI.
*
* @param {string} connectionId