From 2bc4384d017ed4cfd4623364133d5a30a92e32bb Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Mon, 19 Mar 2012 17:44:42 +0000 Subject: [PATCH 1/2] Revert "Dialogs generated by PMA_confirm() should be modal" This reverts commit eabe39881178a827786dfbff4a95c817c60f6288. --- js/functions.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 0f2e7da1df..9a63b88606 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1919,8 +1919,7 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) { buttons: button_options, close: function () { $(this).remove(); - }, - modal: true + } }); }; From 3a5a191772b240d005c2c23a1fef7ff92f1d038a Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Mon, 19 Mar 2012 17:44:44 +0000 Subject: [PATCH 2/2] Revert "PMA_confirm() code clean-up" This reverts commit 04f14a43f513e6df687c9650ba8afc87b45376df. --- js/functions.js | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9a63b88606..b33507819e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1903,24 +1903,17 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) { */ var button_options = {}; button_options[PMA_messages['strOK']] = function(){ - $(this).dialog("close"); + $(this).dialog("close").remove(); - if($.isFunction(callbackFn)) { - callbackFn.call(this, url); - } - }; - button_options[PMA_messages['strCancel']] = function() { - $(this).dialog("close"); - } + if($.isFunction(callbackFn)) { + callbackFn.call(this, url); + } + }; + button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} - $('
', {'id':'confirm_dialog'}) + $('
') .prepend(question) - .dialog({ - buttons: button_options, - close: function () { - $(this).remove(); - } - }); + .dialog({buttons: button_options}); }; /**