The branch, master has been updated via 6b51fd57adcfe67ac4ad8188458e692d310521e7 (commit) from b8b77503d2427b268340af68dad414e13b1dd16d (commit)

- Log ----------------------------------------------------------------- commit 6b51fd57adcfe67ac4ad8188458e692d310521e7 Author: Marc Delisle marc@infomarc.info Date: Thu Jan 27 06:46:17 2011 -0500

Conditional Ajax on db Search Remove extra wrapping of jQuery object Avoid extra generation of hidden field Add vim modeline

-----------------------------------------------------------------------

Summary of changes: db_search.php | 2 +- js/db_search.js | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/db_search.php b/db_search.php index 22415aa..0185879 100644 --- a/db_search.php +++ b/db_search.php @@ -290,7 +290,7 @@ else { */ ?> <a name="db_search"></a> -<form id="db_search_form" method="post" action="db_search.php" name="db_search"> +<form id="db_search_form"<?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> method="post" action="db_search.php" name="db_search"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db']); ?> <fieldset> <legend><?php echo __('Search in database'); ?></legend> diff --git a/js/db_search.js b/js/db_search.js index 93daa1f..ea7280b 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -1,3 +1,4 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @fileoverview JavaScript functions used on Database Search page * @name Database Search @@ -25,18 +26,23 @@ $(document).ready(function() {

/** * Ajax Event handler for retrieving the result of an SQL Query + * (see $GLOBALS['cfg']['AjaxEnable']) * * @uses PMA_ajaxShowMessage() */ - $("#db_search_form").live('submit', function(event) { + $("#db_search_form.ajax").live('submit', function(event) { event.preventDefault();

PMA_ajaxShowMessage(PMA_messages['strSearching']);

- $(this).append('<input type="hidden" name="ajax_request" value="true">'); + $form = $(this);

- $.get($(this).attr('action'), $(this).serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) { + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } + + $.get($form.attr('action'), $form.serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) { $("#searchresults").html(data); }) // end $.get() }) -}, 'top.frame_content'); // end $(document).ready() \ No newline at end of file +}, 'top.frame_content'); // end $(document).ready()

hooks/post-receive