Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-2428] update modal glasspane to always close, even if the dialog we closed by user in close handler

This commit is contained in:
Scott Aslan 2016-07-29 11:25:46 -04:00 committed by joewitt
parent f5dfa580db
commit a8224edb8d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
View File

@ -520,10 +520,10 @@
handler.call(dialog); handler.call(dialog);
} }
if (dialog.is(':visible')) { // remove the modal glass pane overlay
// remove the modal glass pane overlay $('body').find("[data-nf-dialog-parent='" + dialog.attr('id') + "']").remove();
$('body').find("[data-nf-dialog-parent='" + dialog.attr('id') + "']").remove();
if (dialog.is(':visible')) {
// hide the dialog // hide the dialog
dialog.hide(); dialog.hide();
} }

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
View File

@ -1111,7 +1111,7 @@ nf.StatusHistory = (function () {
handler: { handler: {
close: function () { close: function () {
// remove the current status history // remove the current status history
$('#status-history-dialog').removeData('status-history').hide(); $('#status-history-dialog').removeData('status-history');
// reset the dom // reset the dom
$('#status-history-chart-container').empty(); $('#status-history-chart-container').empty();