[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1444-g2064f09

[Marc Delisle]

The branch, master has been updated
       via  2064f09f4273292c166d23c788bfbc1f9e023aaa (commit)
      from  6ca2a7bef3d7485c36264fea962a14a41d621287 (commit)


- Log -----------------------------------------------------------------
commit 2064f09f4273292c166d23c788bfbc1f9e023aaa
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Jan 25 07:26:54 2011 -0500

    Conditional Ajax on table Search

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

Summary of changes:
 js/tbl_select.js |    3 ++-
 tbl_select.php   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/tbl_select.js b/js/tbl_select.js
index 48cf97b..700d0cb 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -48,9 +48,10 @@ $(document).ready(function() {
     /**
      * Ajax event handler for Table Search
      * 
+     * (see $GLOBALS['cfg']['AjaxEnable'])
      * @uses    PMA_ajaxShowMessage()
      */
-    $("#tbl_search_form").live('submit', function(event) {
+    $("#tbl_search_form.ajax").live('submit', function(event) {
         // jQuery object to reuse
         $search_form = $(this);
         event.preventDefault();
diff --git a/tbl_select.php b/tbl_select.php
index 08bc546..0d8cbb7 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -98,7 +98,7 @@ if (!isset($param) || $param[0] == '') {
     // foreign keys from innodb)
     $foreigners = PMA_getForeigners($db, $table);
     ?>
-<form method="post" action="tbl_select.php" name="insertForm" id="tbl_search_form">
+        <form method="post" action="tbl_select.php" name="insertForm" id="tbl_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>>
 <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
 <input type="hidden" name="back" value="tbl_select.php" />


hooks/post-receive
-- 
phpMyAdmin