nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject nifi git commit: [NIFI-3550] inject nf.ConnectionConfiguration into the nf.Cannection module during nf.Graph init. This closes #1560
Date Fri, 03 Mar 2017 14:38:51 GMT
Repository: nifi
Updated Branches:
  refs/heads/master 6c44d6be2 -> 9f669aa94


[NIFI-3550] inject nf.ConnectionConfiguration into the nf.Cannection module during nf.Graph
init. This closes #1560


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9f669aa9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9f669aa9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9f669aa9

Branch: refs/heads/master
Commit: 9f669aa944ff8e0ee70608e89e0c3ef61253252d
Parents: 6c44d6b
Author: Scott Aslan <scottyaslan@gmail.com>
Authored: Thu Mar 2 22:28:20 2017 -0500
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Fri Mar 3 09:38:29 2017 -0500

----------------------------------------------------------------------
 .../src/main/webapp/js/nf/canvas/nf-connection.js        |  5 +++--
 .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/9f669aa9/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 759860b..d7e2e3a 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
@@ -50,8 +50,8 @@
 }(this, function ($, d3, nfCommon, nfDialog, nfErrorHandler, nfClient, nfCanvasUtils) {
     'use strict';
 
-    var nfCanvas;
     var nfSelectable;
+    var nfConnectionConfiguration;
     var nfContextMenu;
 
     // the dimensions for the connection label
@@ -1546,9 +1546,10 @@
          * @param nfSelectableRef   The nfSelectable module.
          * @param nfContextMenuRef   The nfContextMenu module.
          */
-        init: function (nfSelectableRef, nfContextMenuRef) {
+        init: function (nfSelectableRef, nfContextMenuRef, nfConnectionConfigurationRef)
{
             nfSelectable = nfSelectableRef;
             nfContextMenu = nfContextMenuRef;
+            nfConnectionConfiguration = nfConnectionConfigurationRef;
 
             connectionMap = d3.map();
             removedCache = d3.map();

http://git-wip-us.apache.org/repos/asf/nifi/blob/9f669aa9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
index e5c8e22..394bf42 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-graph.js
@@ -30,13 +30,14 @@
                 'nf.ProcessGroup',
                 'nf.Processor',
                 'nf.Connection',
+                'nf.ConnectionConfiguration',
                 'nf.CanvasUtils',
                 'nf.Connectable',
                 'nf.Draggable',
                 'nf.Selectable',
                 'nf.ContextMenu'],
-            function ($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup,
nfProcessGroup, nfProcessor, nfConnection, nfCanvasUtils, nfConnectable, nfDraggable, nfSelectable,
nfContextMenu) {
-                return (nf.Graph = factory($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel,
nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, nfCanvasUtils, nfConnectable,
nfDraggable, nfSelectable, nfContextMenu));
+            function ($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup,
nfProcessGroup, nfProcessor, nfConnection, nfConnectionConfiguration, nfCanvasUtils, nfConnectable,
nfDraggable, nfSelectable, nfContextMenu) {
+                return (nf.Graph = factory($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel,
nfPort, nfRemoteProcessGroup, nfProcessGroup, nfProcessor, nfConnection, nfConnectionConfiguration,
nfCanvasUtils, nfConnectable, nfDraggable, nfSelectable, nfContextMenu));
             });
     } else if (typeof exports === 'object' && typeof module === 'object') {
         module.exports = (nf.Graph =
@@ -51,6 +52,7 @@
                 require('nf.ProcessGroup'),
                 require('nf.Processor'),
                 require('nf.Connection'),
+                require('nf.ConnectionConfiguration'),
                 require('nf.CanvasUtils'),
                 require('nf.Connectable'),
                 require('nf.Draggable'),
@@ -68,13 +70,14 @@
             root.nf.ProcessGroup,
             root.nf.Processor,
             root.nf.Connection,
+            root.nf.ConnectionConfiguration,
             root.nf.CanvasUtils,
             root.nf.Connectable,
             root.nf.Draggable,
             root.nf.Selectable,
             root.nf.ContextMenu);
     }
-}(this, function ($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup,
nfProcessGroup, nfProcessor, nfConnection, nfCanvasUtils, nfConnectable, nfDraggable, nfSelectable,
nfContextMenu) {
+}(this, function ($, d3, nfCommon, nfNgBridge, nfLabel, nfFunnel, nfPort, nfRemoteProcessGroup,
nfProcessGroup, nfProcessor, nfConnection, nfConnectionConfiguration, nfCanvasUtils, nfConnectable,
nfDraggable, nfSelectable, nfContextMenu) {
     'use strict';
 
     var combinePorts = function (contents) {
@@ -201,7 +204,7 @@
             nfRemoteProcessGroup.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu);
             nfProcessGroup.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu);
             nfProcessor.init(nfConnectable, nfDraggable, nfSelectable, nfContextMenu);
-            nfConnection.init(nfSelectable, nfContextMenu);
+            nfConnection.init(nfSelectable, nfContextMenu, nfConnectionConfiguration);
 
             // load the graph
             return nfProcessGroup.enterGroup(nfCanvasUtils.getGroupId());


Mime
View raw message