Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 3eb1ac16a -> 56f8dd972
NIFI-250: - Ensuring the settings (controller service/reporting task) dialog is closed prior to opening a custom UI. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/56f8dd97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/56f8dd97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/56f8dd97 Branch: refs/heads/NIFI-250 Commit: 56f8dd972b4565a367fe317deee5826c215874bd Parents: 3eb1ac1 Author: Matt Gilman <[email protected]> Authored: Fri Mar 27 08:30:52 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Mar 27 08:30:52 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-controller-service.js | 3 +++ .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/56f8dd97/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.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-controller-service.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js index 772888d..8640f4e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js @@ -1546,6 +1546,9 @@ nf.ControllerService = (function () { click: function () { // reset state and close the dialog manually to avoid hiding the faded background controllerServiceDialog.modal('hide'); + + // close the settings dialog since the custom ui is also opened in the shell + $('#shell-close-button').click(); // show the custom ui nf.CustomUi.showCustomUi(controllerService.id, controllerService.customUiUrl, false).done(function () { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/56f8dd97/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.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-reporting-task.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js index 5c39f14..7c95388 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js @@ -610,6 +610,9 @@ nf.ReportingTask = (function () { // reset state and close the dialog manually to avoid hiding the faded background reportingTaskDialog.modal('hide'); + // close the settings dialog since the custom ui is also opened in the shell + $('#shell-close-button').click(); + // show the custom ui nf.CustomUi.showCustomUi(reportingTask.id, reportingTask.customUiUrl, false).done(function() { nf.Settings.showSettings();
