Merge branch 'QA_4_4'

phpmyadmin · Aug 6, 2015 · 65269fa · 65269fa
2 parents 8a16c29 + fe12f2f
commit 65269fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -96,6 +96,7 @@ phpMyAdmin - ChangeLog
 - issue #11326 Exported schema includes all the tables of the database
 - issue #11339 Results not displayed if query ends in delimiter and comment
 - issue #11320 Live edit of data fields is not working always
+- issue        Table list in navigation collapses when entering into a table in another page
 
 4.4.12.0 (2015-07-20)
 - bug       Saved chart image does not have a proper name or an extension

diff --git a/js/navigation.js b/js/navigation.js
@@ -771,16 +771,18 @@ function PMA_showCurrentNavigation() {
                     $expander = $containers[index]
                         .children('div:first')
                         .children('a.expander');
-                    collapseTreeNode($expander);
-                    loadAndShowTableOrView($expander, $containers[index], itemName);
+                    if (! $expander.hasClass('loaded')) {
+                    	loadAndShowTableOrView($expander, $containers[index], itemName);
+                    }
                 });
             // else if no subContainers
             } else {
                 $expander = $dbItem
                     .children('div:first')
                     .children('a.expander');
-                collapseTreeNode($expander);
-                loadAndShowTableOrView($expander, $dbItem, itemName);
+                if (! $expander.hasClass('loaded')) {
+                	loadAndShowTableOrView($expander, $dbItem, itemName);
+                }
             }
         }
     }