Repository: nifi Updated Branches: refs/heads/master 06d1276f0 -> cb216b79e
NIFI-5208: - Ensuring nf-storage is injected where necessary. This closes #2757 Signed-off-by: Scott Aslan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cb216b79 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cb216b79 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cb216b79 Branch: refs/heads/master Commit: cb216b79ece5a149e3b1d023bb6cd6f3764af0b8 Parents: 06d1276 Author: Matt Gilman <[email protected]> Authored: Mon Jun 4 12:37:16 2018 -0400 Committer: Scott Aslan <[email protected]> Committed: Tue Jun 5 09:33:25 2018 -0400 ---------------------------------------------------------------------- .../main/webapp/js/nf/canvas/nf-component-version.js | 13 ++++++++----- .../src/main/webapp/js/nf/canvas/nf-connection.js | 9 ++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/cb216b79/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-version.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-version.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-version.js index e1b7f9b..b8b5038 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-version.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-version.js @@ -25,32 +25,35 @@ define(['jquery', 'nf.ErrorHandler', 'nf.Common', + 'nf.Storage', 'nf.Client', 'nf.CanvasUtils', 'nf.ProcessGroupConfiguration', 'nf.ng.Bridge'], - function ($, Slick, nfErrorHandler, nfCommon, nfClient, nfCanvasUtils, nfProcessGroupConfiguration, nfNgBridge) { - return (nf.ComponentState = factory($, nfErrorHandler, nfCommon, nfClient, nfCanvasUtils, nfProcessGroupConfiguration, nfNgBridge)); + function ($, Slick, nfErrorHandler, nfCommon, nfStorage, nfClient, nfCanvasUtils, nfProcessGroupConfiguration, nfNgBridge) { + return (nf.ComponentState = factory($, nfErrorHandler, nfCommon, nfStorage, nfClient, nfCanvasUtils, nfProcessGroupConfiguration, nfNgBridge)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.ComponentState = factory(require('jquery'), require('nf.ErrorHandler'), - require('nf.Common', + require('nf.Common'), + require('nf.Storage'), require('nf.Client'), require('nf.CanvasUtils'), require('nf.ProcessGroupConfiguration'), - require('nf.ng.Bridge')))); + require('nf.ng.Bridge'))); } else { nf.ComponentVersion = factory(root.$, root.nf.ErrorHandler, root.nf.Common, + root.nf.Storage, root.nf.Client, root.nf.CanvasUtils, root.nf.ProcessGroupConfiguration, root.nf.ng.Bridge); } -}(this, function ($, nfErrorHandler, nfCommon, nfClient, nfCanvasUtils, nfProcessGroupConfiguration, nfNgBridge) { +}(this, function ($, nfErrorHandler, nfCommon, nfStorage, nfClient, nfCanvasUtils, nfProcessGroupConfiguration, nfNgBridge) { 'use strict'; var versionMap; http://git-wip-us.apache.org/repos/asf/nifi/blob/cb216b79/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 7c57d04..4bbc369 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 @@ -23,11 +23,12 @@ 'd3', 'nf.Common', 'nf.Dialog', + 'nf.Storage', 'nf.ErrorHandler', 'nf.Client', 'nf.CanvasUtils'], - function ($, d3, nfCommon, nfDialog, nfErrorHandler, nfClient, nfCanvasUtils) { - return (nf.Connection = factory($, d3, nfCommon, nfDialog, nfErrorHandler, nfClient, nfCanvasUtils)); + function ($, d3, nfCommon, nfDialog, nfStorage, nfErrorHandler, nfClient, nfCanvasUtils) { + return (nf.Connection = factory($, d3, nfCommon, nfDialog, nfStorage, nfErrorHandler, nfClient, nfCanvasUtils)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.Connection = @@ -35,6 +36,7 @@ require('d3'), require('nf.Common'), require('nf.Dialog'), + require('nf.Storage'), require('nf.ErrorHandler'), require('nf.Client'), require('nf.CanvasUtils'))); @@ -43,11 +45,12 @@ root.d3, root.nf.Common, root.nf.Dialog, + root.nf.Storage, root.nf.ErrorHandler, root.nf.Client, root.nf.CanvasUtils); } -}(this, function ($, d3, nfCommon, nfDialog, nfErrorHandler, nfClient, nfCanvasUtils) { +}(this, function ($, d3, nfCommon, nfDialog, nfStorage, nfErrorHandler, nfClient, nfCanvasUtils) { 'use strict'; var nfSelectable;
