remove() the dialog properly. Now closing the dialog with the X have the same effect as closing it with buttons.

1 files changed, 12 insertions, 2 deletions

diff --git a/js/db_structure.js b/js/db_structure.js
index 5adff6ef27..e0b786495c 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -144,10 +144,14 @@ $(function() {
          */
         var button_options = {};
         // in the following function we need to use $(this)
-        button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
+        button_options[PMA_messages['strCancel']] = function() {
+            $(this).dialog('close');
+        };
 
         var button_options_error = {};
-        button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();}
+        button_options_error[PMA_messages['strOK']] = function() {
+            $(this).dialog('close');
+        };
 
         var $msgbox = PMA_ajaxShowMessage();
 
@@ -162,6 +166,9 @@ $(function() {
                     width: 900,
                     modal: true,
                     open: PMA_verifyColumnsProperties,
+                    close: function() {
+                        $(this).remove();
+                    },
                     buttons : button_options_error
                 })// end dialog options
             } else {
@@ -173,6 +180,9 @@ $(function() {
                         width: 900,
                         modal: true,
                         open: PMA_verifyColumnsProperties,
+                        close: function() {
+                            $(this).remove();
+                        },
                         buttons : button_options
                     });// end dialog options
                 //Remove the top menu container from the dialog