Repository: nifi Updated Branches: refs/heads/master a73c8bba3 -> 0c8fc25ba
[NIFI-2428] update modal glasspane to always close, even if the dialog we closed by user in close handler Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a8224edb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a8224edb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a8224edb Branch: refs/heads/master Commit: a8224edb8d8c26aad8975eb2d40c2209448127fe Parents: f5dfa58 Author: Scott Aslan <[email protected]> Authored: Fri Jul 29 11:25:46 2016 -0400 Committer: joewitt <[email protected]> Committed: Fri Jul 29 12:12:00 2016 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/jquery/modal/jquery.modal.js | 6 +++--- .../nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a8224edb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js index 0993c88..7fede63 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js @@ -520,10 +520,10 @@ handler.call(dialog); } - if (dialog.is(':visible')) { - // remove the modal glass pane overlay - $('body').find("[data-nf-dialog-parent='" + dialog.attr('id') + "']").remove(); + // remove the modal glass pane overlay + $('body').find("[data-nf-dialog-parent='" + dialog.attr('id') + "']").remove(); + if (dialog.is(':visible')) { // hide the dialog dialog.hide(); } http://git-wip-us.apache.org/repos/asf/nifi/blob/a8224edb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js index 88aa631..9a67688 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js @@ -1111,7 +1111,7 @@ nf.StatusHistory = (function () { handler: { close: function () { // remove the current status history - $('#status-history-dialog').removeData('status-history').hide(); + $('#status-history-dialog').removeData('status-history'); // reset the dom $('#status-history-chart-container').empty();
