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 2017/02/16 20:54:26 UTC
nifi git commit: [NIFI-3360] resolve clashing variable name for
connection and nf.Connection. This closes #1506
Repository: nifi
Updated Branches:
refs/heads/master 855743f93 -> d9828c240
[NIFI-3360] resolve clashing variable name for connection and nf.Connection. This closes #1506
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d9828c24
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d9828c24
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d9828c24
Branch: refs/heads/master
Commit: d9828c240b87f36af7e3d9aefed753d4315f8b0a
Parents: 855743f
Author: Scott Aslan <sc...@gmail.com>
Authored: Tue Feb 14 11:26:08 2017 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Feb 16 15:54:00 2017 -0500
----------------------------------------------------------------------
.../main/webapp/js/nf/canvas/nf-draggable.js | 62 ++++++++++----------
1 file changed, 32 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/d9828c24/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js
index bdccfe3..f4adb92 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js
@@ -28,8 +28,8 @@
'nf.Dialog',
'nf.Client',
'nf.ErrorHandler'],
- function ($, d3, connection, birdseye, canvasUtils, common, dialog, client, errorHandler) {
- return (nf.Draggable = factory($, d3, connection, birdseye, canvasUtils, common, dialog, client, errorHandler));
+ function ($, d3, nfConnection, birdseye, canvasUtils, common, dialog, client, errorHandler) {
+ return (nf.Draggable = factory($, d3, nfConnection, birdseye, canvasUtils, common, dialog, client, errorHandler));
});
} else if (typeof exports === 'object' && typeof module === 'object') {
module.exports = (nf.Draggable =
@@ -53,7 +53,7 @@
root.nf.Client,
root.nf.ErrorHandler);
}
-}(this, function ($, d3, connection, birdseye, canvasUtils, common, dialog, client, errorHandler) {
+}(this, function ($, d3, nfConnection, birdseye, canvasUtils, common, dialog, client, errorHandler) {
'use strict';
var nfCanvas;
@@ -102,10 +102,10 @@
// go through each selected component
selectedComponents.each(function (d) {
// consider any self looping connections
- var connections = connection.getComponentConnections(d.id);
+ var connections = nfConnection.getComponentConnections(d.id);
$.each(connections, function (_, connection) {
if (!updates.has(connection.id) && canvasUtils.getConnectionSourceComponentId(connection) === canvasUtils.getConnectionDestinationComponentId(connection)) {
- var connectionUpdate = nfDraggable.updateConnectionPosition(connection.get(connection.id), delta);
+ var connectionUpdate = nfDraggable.updateConnectionPosition(nfConnection.get(connection.id), delta);
if (connectionUpdate !== null) {
updates.set(connection.id, connectionUpdate);
}
@@ -335,7 +335,7 @@
contentType: 'application/json'
}).done(function (response) {
// update the component
- connection.set(response);
+ nfConnection.set(response);
// resolve with an object so we can refresh when finished
deferred.resolve({
@@ -363,32 +363,34 @@
* @param updates
*/
refreshConnections: function (updates) {
- // wait for all updates to complete
- $.when.apply(window, updates.values()).done(function () {
- var dragged = $.makeArray(arguments);
- var connections = d3.set();
-
- // refresh this component
- $.each(dragged, function (_, component) {
- // check if the component in question is a connection
- if (component.type === 'Connection') {
- connections.add(component.id);
- } else {
- // get connections that need to be refreshed because its attached to this component
- var componentConnections = connection.getComponentConnections(component.id);
- $.each(componentConnections, function (_, connection) {
- connections.add(connection.id);
- });
- }
- });
+ if (updates.size() > 0) {
+ // wait for all updates to complete
+ $.when.apply(window, updates.values()).done(function () {
+ var dragged = $.makeArray(arguments);
+ var connections = d3.set();
+
+ // refresh this component
+ $.each(dragged, function (_, component) {
+ // check if the component in question is a connection
+ if (component.type === 'Connection') {
+ connections.add(component.id);
+ } else {
+ // get connections that need to be refreshed because its attached to this component
+ var componentConnections = nfConnection.getComponentConnections(component.id);
+ $.each(componentConnections, function (_, connection) {
+ connections.add(connection.id);
+ });
+ }
+ });
- // refresh the connections
- connections.forEach(function (connectionId) {
- connection.refresh(connectionId);
+ // refresh the connections
+ connections.forEach(function (connectionId) {
+ nfConnection.refresh(connectionId);
+ });
+ }).always(function () {
+ birdseye.refresh();
});
- }).always(function () {
- birdseye.refresh();
- });
+ }
},
/**