From 45ba32fa18caa705275fc03900a45f22c635daa8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 30 Dec 2010 07:27:19 -0500 Subject: [PATCH] AJAX navi buttons do not work in search results, so use the same div as in normal browse results --- js/tbl_select.js | 27 ++++----------------------- tbl_select.php | 2 +- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index 208daac73..3c6cae338 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -22,25 +22,6 @@ $(document).ready(function() { cache: 'false' }); - /** - * Attach the {@link appendInlineAnchor} function to a custom event, which - * will be triggered manually everytime the table of results is reloaded; - * - * Needs appendInlineAnchor() which is defined in sql.js - * @memberOf jQuery - */ - $("#searchresults").live('appendAnchor',function() { - appendInlineAnchor(); - }) - - /** - * Trigger the appendAnchor event to prepare the first table for inline edit - * - * @memberOf jQuery - */ - $("#searchresults").trigger('appendAnchor'); - - $('') .html(PMA_messages['strShowSearchCriteria']) .insertAfter('#tbl_search_form') @@ -70,7 +51,7 @@ $(document).ready(function() { event.preventDefault(); // empty previous search results while we are waiting for new results - $("#searchresults").empty(); + $("#sqlqueryresults").empty(); PMA_ajaxShowMessage(PMA_messages['strSearching']); // add this hidden field just once @@ -81,8 +62,8 @@ $(document).ready(function() { $.post($search_form.attr('action'), $search_form.serialize(), function(response) { if (typeof response == 'string') { // found results - $("#searchresults").html(response); - $("#searchresults").trigger('appendAnchor'); + $("#sqlqueryresults").html(response); + $("#sqlqueryresults").trigger('appendAnchor'); $('#tbl_search_form').hide(); $('#togglesearchform') // always start with the Show message @@ -91,7 +72,7 @@ $(document).ready(function() { .show(); } else { // error message (zero rows) - $("#searchresults").html(response['message']); + $("#sqlqueryresults").html(response['message']); } }) }) diff --git a/tbl_select.php b/tbl_select.php index 6913a9aa0..67bf5d24b 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -303,7 +303,7 @@ $(function() { -
+