gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-07-19 18:40:08 +02:00
commit d9a42ef4a0
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/sql.js
View File

@ -241,7 +241,7 @@ $(document).ready(function() {
$("#sqlqueryform.ajax").live('submit', function(event) {
event.preventDefault();
$form = $(this);
var $form = $(this);
if (! checkSqlQuery($form[0])) {
return false;
}
@ -250,11 +250,12 @@ $(document).ready(function() {
$('.error').remove();
var $msgbox = PMA_ajaxShowMessage();
var $sqlqueryresults = $('#sqlqueryresults');
PMA_prepareForAjaxRequest($form);
$.post($(this).attr('action'), $(this).serialize() , function(data) {
if(data.success == true) {
$.post($form.attr('action'), $form.serialize() , function(data) {
if (data.success == true) {
// fade out previous messages, if any
$('.success').fadeOut();
$('.sqlquery_message').fadeOut();
@ -268,7 +269,7 @@ $(document).ready(function() {
} else {
$('#sqlqueryform').before(data.message);
}
$('#sqlqueryresults').show();
$sqlqueryresults.show();
// this happens if a USE command was typed
if (typeof data.reload != 'undefined') {
// Unbind the submit event before reloading. See bug #3295529
@ -285,25 +286,25 @@ $(document).ready(function() {
else if (data.success == false ) {
// show an error message that stays on screen
$('#sqlqueryform').before(data.error);
$('#sqlqueryresults').hide();
$sqlqueryresults.hide();
}
else {
// real results are returned
// fade out previous messages, if any
$('.success').fadeOut();
$('.sqlquery_message').fadeOut();
$received_data = $(data);
$zero_row_results = $received_data.find('textarea[name="sql_query"]');
var $received_data = $(data);
var $zero_row_results = $received_data.find('textarea[name="sql_query"]');
// if zero rows are returned from the query execution
if ($zero_row_results.length > 0) {
$('#sqlquery').val($zero_row_results.val());
} else {
$('#sqlqueryresults').show();
$("#sqlqueryresults").html(data);
$("#sqlqueryresults").trigger('appendAnchor');
$("#sqlqueryresults").trigger('makegrid');
$sqlqueryresults.show();
$sqlqueryresults.html(data);
$sqlqueryresults.trigger('appendAnchor');
$sqlqueryresults.trigger('makegrid');
$('#togglequerybox').show();
if($("#togglequerybox").siblings(":visible").length > 0) {
if ($("#togglequerybox").siblings(":visible").length > 0) {
$("#togglequerybox").trigger('click');
}
PMA_init_slider();
@ -333,16 +334,18 @@ $(document).ready(function() {
var $msgbox = PMA_ajaxShowMessage();
/**
* @var $the_form Object referring to the form element that paginates the results table
* @var $form Object referring to the form element that paginates the results table
*/
var $the_form = $(this).parent("form");
var $form = $(this).parent("form");
$the_form.append('<input type="hidden" name="ajax_request" value="true" />');
var $sqlqueryresults = $("#sqlqueryresults");
$.post($the_form.attr('action'), $the_form.serialize(), function(data) {
$("#sqlqueryresults").html(data);
$("#sqlqueryresults").trigger('appendAnchor');
$("#sqlqueryresults").trigger('makegrid');
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize(), function(data) {
$sqlqueryresults.html(data);
$sqlqueryresults.trigger('appendAnchor');
$sqlqueryresults.trigger('makegrid');
PMA_init_slider();
PMA_ajaxRemoveMessage($msgbox);