Merge branch 'QA_3_5'

Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
This commit is contained in:
Rouslan Placella 2012-03-18 23:44:24 +00:00
commit 86410aea9d

View File

@ -1819,17 +1819,25 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) {
*/
var button_options = {};
button_options[PMA_messages['strOK']] = function(){
$(this).dialog("close").remove();
$(this).dialog("close");
if($.isFunction(callbackFn)) {
callbackFn.call(this, url);
}
};
button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
if($.isFunction(callbackFn)) {
callbackFn.call(this, url);
}
};
button_options[PMA_messages['strCancel']] = function() {
$(this).dialog("close");
}
$('<div id="confirm_dialog"></div>')
$('<div/>', {'id':'confirm_dialog'})
.prepend(question)
.dialog({buttons: button_options});
.dialog({
buttons: button_options,
close: function () {
$(this).remove();
},
modal: true
});
};
/**