gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #668 from kasunchathuranga/navSelect

Browse Source 
Proceed only if the database is found
This commit is contained in:
Marc Delisle 2013-09-05 04:30:29 -07:00
commit 6d5545f31a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/navigation.js
View File

@ -313,17 +313,19 @@ function PMA_showCurrentNavigation()
var $dbItem = highlightLoadedItem(
$('#pma_navigation_tree > div'), db, 'database', false, false
);
// open the table in the tree and select it
var $expander = $dbItem.children('div:first').children('a.expander');
// if not loaded or loaded but collapsed
if (! $expander.hasClass('loaded')
|| $expander.find('img').is('.ic_b_plus')
) {
expandTreeNode($expander, function() {
if ($dbItem) {
// open the table in the tree and select it
var $expander = $dbItem.children('div:first').children('a.expander');
// if not loaded or loaded but collapsed
if (! $expander.hasClass('loaded')
|| $expander.find('img').is('.ic_b_plus')
) {
expandTreeNode($expander, function() {
loadAndHighlightTableOrView($dbItem, table);
});
} else {
loadAndHighlightTableOrView($dbItem, table);
});
} else {
loadAndHighlightTableOrView($dbItem, table);
}
}
} else if (db) { // if we are at the database level
// open in the tree and select the database