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

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Michal Čihař 2011-07-21 16:14:47 +02:00
commit ba395f545e
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/sql.js
View File

@ -281,10 +281,11 @@ $(document).ready(function() {
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()
.html(data)
.trigger('appendAnchor')
.trigger('makegrid');
$('#togglequerybox').show();
if ($("#togglequerybox").siblings(":visible").length > 0) {
$("#togglequerybox").trigger('click');
@ -320,14 +321,13 @@ $(document).ready(function() {
*/
var $form = $(this).parent("form");
var $sqlqueryresults = $("#sqlqueryresults");
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize(), function(data) {
$sqlqueryresults.html(data);
$sqlqueryresults.trigger('appendAnchor');
$sqlqueryresults.trigger('makegrid');
$("#sqlqueryresults")
.html(data)
.trigger('appendAnchor')
.trigger('makegrid');
PMA_init_slider();
PMA_ajaxRemoveMessage($msgbox);
@ -341,22 +341,23 @@ $(document).ready(function() {
* @see $cfg['AjaxEnable']
*/
$("#pageselector").live('change', function(event) {
var $the_form = $(this).parent("form");
var $form = $(this).parent("form");
if ($(this).hasClass('ajax')) {
event.preventDefault();
var $msgbox = PMA_ajaxShowMessage();
$.post($the_form.attr('action'), $the_form.serialize() + '&ajax_request=true', function(data) {
$("#sqlqueryresults").html(data);
$("#sqlqueryresults").trigger('appendAnchor');
$("#sqlqueryresults").trigger('makegrid');
$.post($form.attr('action'), $form.serialize() + '&ajax_request=true', function(data) {
$("#sqlqueryresults")
.html(data)
.trigger('appendAnchor')
.trigger('makegrid');
PMA_init_slider();
PMA_ajaxRemoveMessage($msgbox);
}) // end $.post()
} else {
$the_form.submit();
$form.submit();
}
})// end Paginate results with Page Selector