[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10551-ge3e0b2e

[Marc Delisle]

The branch, master has been updated
       via  e3e0b2ef99b1f4b2872fc1e51778803675f8b41d (commit)
      from  1406bd83b045e3e195b379ffb02848dd4ca7d7e1 (commit)


- Log -----------------------------------------------------------------
commit e3e0b2ef99b1f4b2872fc1e51778803675f8b41d
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Oct 9 10:23:06 2010 -0400

    refresh navi frame after table creation in a non-empty db; also refresh after table drop via drop link

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

Summary of changes:
 js/db_structure.js |    6 +++++-
 js/functions.js    |    9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/js/db_structure.js b/js/db_structure.js
index 8e658fb..611dd92 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -93,6 +93,10 @@ $(document).ready(function() {
                     PMA_ajaxShowMessage(data.message);
                     //need to find a better solution here.  The icon should be replaced
                     $(curr_row).hide("medium").remove();
+
+                    if (window.parent && window.parent.frame_navigation) {
+                        window.parent.frame_navigation.location.reload();
+                    }
                 }
                 else {
                     PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
@@ -221,4 +225,4 @@ $(document).ready(function() {
         return false;
     }) //end Calculate Real End for InnoDB
 
-}, 'top.frame_content'); // end $(document).ready()
\ No newline at end of file
+}, 'top.frame_content'); // end $(document).ready()
diff --git a/js/functions.js b/js/functions.js
index 57bbd88..3a53ace 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2041,7 +2041,6 @@ $(document).ready(function() {
      *
      * @uses    PMA_ajaxShowMessage()
      * @uses    $.PMA_sort_table()
-     * @uses    window.parent.refreshNavigation()
      *
      */
     // .live() must be called after a selector, see http://api.jquery.com/live
@@ -2098,7 +2097,9 @@ $(document).ready(function() {
                 $(tables_table).PMA_sort_table('th');
 
                 //Refresh navigation frame as a new table has been added
-                window.parent.refreshNavigation();
+                if (window.parent && window.parent.frame_navigation) {
+                    window.parent.frame_navigation.location.reload();
+                }
             }
             else {
                 PMA_ajaxShowMessage(data.error);
@@ -2200,7 +2201,9 @@ $(document).ready(function() {
                     .end()
                     .after(data.sql_query);
                     window.parent.table = '';
-                    window.parent.refreshNavigation();
+                    if (window.parent && window.parent.frame_navigation) {
+                        window.parent.frame_navigation.location.reload();
+                    }
                 }
                 else {
                     PMA_ajaxShowMessage(data.error);


hooks/post-receive
-- 
phpMyAdmin