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

Conditional Ajax on sorting results

Browse Source
This commit is contained in:
Marc Delisle
2011-02-05 07:34:56 -05:00
parent f328f6d4a9
commit 3be1863606
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/sql.js
View File

@@ -269,6 +269,7 @@ $(document).ready(function() {
* @memberOf jQuery * @memberOf jQuery
* @name paginate_nav_button_click * @name paginate_nav_button_click
* @uses PMA_ajaxShowMessage() * @uses PMA_ajaxShowMessage()
* @see $cfg['AjaxEnable']
*/ */
$("input[name=navig].ajax").live('click', function(event) { $("input[name=navig].ajax").live('click', function(event) {
/** @lends jQuery */ /** @lends jQuery */
@@ -293,11 +294,11 @@ $(document).ready(function() {
* Paginate results with Page Selector dropdown * Paginate results with Page Selector dropdown
* @memberOf jQuery * @memberOf jQuery
* @name paginate_dropdown_change * @name paginate_dropdown_change
* @see $cfg['AjaxEnable']
*/ */
$("#pageselector").live('change', function(event) { $("#pageselector").live('change', function(event) {
var $the_form = $(this).parent("form"); var $the_form = $(this).parent("form");
// see $cfg['AjaxEnable']
if ($(this).hasClass('ajax')) { if ($(this).hasClass('ajax')) {
event.preventDefault(); event.preventDefault();
@@ -317,8 +318,9 @@ $(document).ready(function() {
* Ajax Event handler for sorting the results table * Ajax Event handler for sorting the results table
* @memberOf jQuery * @memberOf jQuery
* @name table_results_sort_click * @name table_results_sort_click
* @see $cfg['AjaxEnable']
*/ */
$("#table_results").find("a[title=Sort]").live('click', function(event) { $("#table_results.ajax").find("a[title=Sort]").live('click', function(event) {
event.preventDefault(); event.preventDefault();
PMA_ajaxShowMessage(); PMA_ajaxShowMessage();

6
libraries/display_tbl.lib.php
View File

@@ -623,7 +623,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo '<input type="hidden" name="goto" value="sql.php" />' . "\n"; echo '<input type="hidden" name="goto" value="sql.php" />' . "\n";
} }
echo '<table id="table_results" class="data">' . "\n"; echo '<table id="table_results" class="data';
if ($GLOBALS['cfg']['AjaxEnable']) {
echo ' ajax';
}
echo '">' . "\n";
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
echo '<thead><tr>' . "\n"; echo '<thead><tr>' . "\n";