From a8224edb8d8c26aad8975eb2d40c2209448127fe Mon Sep 17 00:00:00 2001
From: Scott Aslan <jaslan@hortonworks.com>
Date: Fri, 29 Jul 2016 11:25:46 -0400
Subject: [PATCH] [NIFI-2428] update modal glasspane to always close, even if
 the dialog we closed by user in close handler

---
 .../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(-)

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 0993c88254..7fede63501 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();
                 }
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 88aa631c0a..9a6768827d 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();