Merge remote branch 'origin/master'

js/tbl_select.js

@@ -22,13 +22,18 @@ $(document).ready(function() {
         cache: 'false'
     });
 
-    $('<a id="togglesearchform"></a>')
-     .html(PMA_messages['strShowSearchCriteria'])
+    /**
+     * Prepare a div containing a link, otherwise it's incorrectly displayed 
+     * after a couple of clicks
+     */
+    $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>')
      .insertAfter('#tbl_search_form')
      // don't show it until we have results on-screen
      .hide();
 
-    $('#togglesearchform').bind('click', function() {
+    $('#togglesearchformlink')
+        .html(PMA_messages['strShowSearchCriteria'])
+        .bind('click', function() {
             var $link = $(this);
             $('#tbl_search_form').slideToggle();
             if ($link.text() == PMA_messages['strHideSearchCriteria']) {
@@ -38,7 +43,7 @@ $(document).ready(function() {
             }
             // avoid default click action
             return false;
-    })
+        });
 
     /**
      * Ajax event handler for Table Search
@@ -65,10 +70,11 @@ $(document).ready(function() {
                 $("#sqlqueryresults").html(response);
                 $("#sqlqueryresults").trigger('appendAnchor');
                 $('#tbl_search_form').hide();
-                $('#togglesearchform')
+                $('#togglesearchformlink')
                  // always start with the Show message
                  .text(PMA_messages['strShowSearchCriteria'])
-                 // now it's time to show the link
+                $('#togglesearchformdiv')
+                 // now it's time to show the div containing the link 
                  .show();
             } else {
                 // error message (zero rows)

libraries/common.lib.php

@@ -2546,9 +2546,10 @@ function PMA_generate_slider_effect($id, $message)
         $('<a href="#<?php echo $id; ?>" id="anchor_<?php echo $id; ?>"><?php echo htmlspecialchars($message); ?></a>')
             .insertBefore('#<?php echo $id; ?>')
             .click(function() {
-                // the callback should be the 4th parameter but
-                // it only works as the second parameter
-                $('#<?php echo $id; ?>').toggle('drop', function() {
+                // The callback should be the 4th parameter but
+                // it only works as the second parameter;
+                // For the possible effects see http://jqueryui.com/demos/show
+                $('#<?php echo $id; ?>').toggle('clip', function() {
                     PMA_set_status_label_<?php echo $id; ?>();
                 });
             });