Fixed the empty notice divison being generated when PMA_showMessage() was being passed a NULL query

This commit is contained in:
ninadsp
2010-07-12 23:11:41 +05:30
parent f06bb69bb8
commit 7d3245cbcd
3 changed files with 22 additions and 3 deletions

View File

@@ -44,6 +44,12 @@ $(document).ready(function() {
.end() .end()
.after(data.sql_query); .after(data.sql_query);
//Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
var notice_class = $("#topmenucontainer").next("div").find('.notice');
if($(notice_class).text() == '') {
$(notice_class).remove();
}
$("<span>" + PMA_messages['strReloadDatabase'] + "?</span>").dialog({ $("<span>" + PMA_messages['strReloadDatabase'] + "?</span>").dialog({
buttons: button_options buttons: button_options
}) //end dialog options }) //end dialog options

View File

@@ -138,6 +138,12 @@ $(document).ready(function() {
.remove() .remove()
.end() .end()
.after(data.sql_query); .after(data.sql_query);
//Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
var notice_class = $("#topmenucontainer").next("div").find('.notice');
if($(notice_class).text() == '') {
$(notice_class).remove();
}
} }
else { else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000");

View File

@@ -270,6 +270,13 @@ $(document).ready(function() {
.remove() .remove()
.end() .end()
.after(data.sql_query); .after(data.sql_query);
//Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
var notice_class = $("#topmenucontainer").next("div").find('.notice');
if($(notice_class).text() == '') {
$(notice_class).remove();
}
$(the_form).find('input:reset').trigger('click'); $(the_form).find('input:reset').trigger('click');
} }
else { else {