[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1330-gecdbb6d

[Marc Delisle]

The branch, master has been updated
       via  ecdbb6dcc73aa97fc4df90d92e0ff4b4530f69e9 (commit)
      from  c63d6a59a17f618de00311eb2b2d20ae5e5ae426 (commit)


- Log -----------------------------------------------------------------
commit ecdbb6dcc73aa97fc4df90d92e0ff4b4530f69e9
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Dec 30 08:14:46 2010 -0500

    Bug #3141319 Query execution time changes and disappears when no rows are returned

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

Summary of changes:
 js/sql.js |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 875b501..96483e0 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -224,7 +224,10 @@ $(document).ready(function() {
 
         $.post($(this).attr('action'), $(this).serialize() , function(data) {
             if(data.success == true) {
-                PMA_ajaxShowMessage(data.message);
+                // fade out previous success message, if any 
+                $('.success').fadeOut();
+                // show a message that stays on screen 
+                $('#sqlqueryform').before(data.message);
                 $('#sqlqueryresults').show();
                 // this happens if a USE command was typed
                 if (typeof data.reload != 'undefined') {
@@ -243,6 +246,7 @@ $(document).ready(function() {
                 $('#sqlqueryresults').hide();
             }
             else {
+                // real results are returned
                 $('#sqlqueryresults').show();
                 $("#sqlqueryresults").html(data);
                 $("#sqlqueryresults").trigger('appendAnchor');


hooks/post-receive
-- 
phpMyAdmin