[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21938-g4547ca3

[Rouslan Placella]

The branch, master has been updated
       via  4547ca37f4c9f5e71a59849272665c4d0180fb1b (commit)
      from  c52063d283fe2e58a397f6832b87ae9fceef0ef2 (commit)


- Log -----------------------------------------------------------------
commit 4547ca37f4c9f5e71a59849272665c4d0180fb1b
Author: Rouslan Placella <rouslan at placella.com>
Date:   Sun Oct 30 16:11:03 2011 +0000

    Removed an unncessary AJAX request from database search

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

Summary of changes:
 ChangeLog       |    3 ++-
 js/db_search.js |   21 ++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc44298..a23a65e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,9 +51,10 @@ phpMyAdmin - ChangeLog
 - bug #3356456 [interface] Interface problems for queries having LIMIT clauses
 + [interface] Remove DefaultPropDisplay feature
 - bug #3299486 [prettyprint] Order By in a query containing comment character
-- [interface] Improved ENUM/SET editor
++ [interface] Improved ENUM/SET editor
 + patch #3428376 [pmadb] pmadb on a different MySQL server
 + patch #3410688 [interface] Improving field size for character columns
+- [usability] Removed an unnecessary AJAX request from database search
 
 3.4.8.0 (not yet released)
 - bug #3425230 [interface] enum data split at space char (more space to edit)
diff --git a/js/db_search.js b/js/db_search.js
index 026d470..4b9ef61 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -58,17 +58,16 @@ function deleteResult(result_path , msg , ajaxEnable)
             {
                 var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting']);
                 /** Load the deleted option to the page*/
-                $('#browse-results').load(result_path + " '"+'#result_query' + "'", function () { // FIXME: no need for two ajax reqests here
-                    $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'", function () { // since they both fetch the same page
-                        /** Refresh the search results after the deletion */
-                        document.getElementById('buttonGo').click();
-                        $('#togglequerybox').html(PMA_messages['strHideQueryBox']);
-                        PMA_ajaxRemoveMessage($msg);
-                        /** Show the results of the deletion option */
-                        $('#browse-results').show();
-                        $('#sqlqueryform').show();
-                        $('#togglequerybox').show();
-                    });
+                $('#sqlqueryform').html('');
+                $('#browse-results').load(result_path + " #result_query, #sqlqueryform", function () {
+                    /** Refresh the search results after the deletion */
+                    document.getElementById('buttonGo').click();
+                    $('#togglequerybox').html(PMA_messages['strHideQueryBox']);
+                    PMA_ajaxRemoveMessage($msg);
+                    /** Show the results of the deletion option */
+                    $('#browse-results').show();
+                    $('#sqlqueryform').show();
+                    $('#togglequerybox').show();
                 });
             }
             else


hooks/post-receive
-- 
phpMyAdmin