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

renamed JavaScript function refreshLeft() to refreshNavigation()

Browse Source
This commit is contained in:
Sebastian Mendel
2006-07-04 06:30:44 +00:00
parent abe4cb310e
commit 9bd00d3dff
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-07-04 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* js\querywindow.js, libraries\footer.inc.php: renamed JavaScript function
refreshLeft() to refreshNavigation()
2006-07-03 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-07-03 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* index.php, js\querywindow.js, querywindow.php, libraries\common.lib.php, * index.php, js\querywindow.js, querywindow.php, libraries\common.lib.php,
libraries\footer.inc.php, libraries\sql_query_form.lib.php: libraries\footer.inc.php, libraries\sql_query_form.lib.php:

10
js/querywindow.js
View File

@@ -24,7 +24,7 @@ function setDb( new_db ) {
if (window.frame_navigation.document.getElementById(db) == null) { if (window.frame_navigation.document.getElementById(db) == null) {
// db is unknown, reload complete left frame // db is unknown, reload complete left frame
refreshLeft(); refreshNavigation();
} else { } else {
unmarkDbTable(old_db); unmarkDbTable(old_db);
markDbTable(db); markDbTable(db);
@@ -53,7 +53,7 @@ function setTable( new_table ) {
if (window.frame_navigation.document.getElementById(db + '.' + table) == null if (window.frame_navigation.document.getElementById(db + '.' + table) == null
&& table != '') { && table != '') {
// table is unknown, reload complete left frame // table is unknown, reload complete left frame
refreshLeft(); refreshNavigation();
} }
// TODO: add code to expand table in lightview mode // TODO: add code to expand table in lightview mode
@@ -79,7 +79,7 @@ function refreshMain( url ) {
'main' ); 'main' );
} }
function refreshLeft() { function refreshNavigation() {
goTo('left.php?&server=' + server + goTo('left.php?&server=' + server +
'&db=' + db + '&db=' + db +
'&table=' + table + '&table=' + table +
@@ -164,7 +164,7 @@ function setAll( new_lang, new_collation_connection, new_server, new_db, new_tab
table = new_table; table = new_table;
collation_connection = new_collation_connection; collation_connection = new_collation_connection;
lang = new_lang; lang = new_lang;
refreshLeft(); refreshNavigation();
} else if (new_db != db || new_table != table) { } else if (new_db != db || new_table != table) {
// save new db and table // save new db and table
var old_db = db; var old_db = db;
@@ -175,7 +175,7 @@ function setAll( new_lang, new_collation_connection, new_server, new_db, new_tab
if (window.frame_navigation.document.getElementById(db) == null if (window.frame_navigation.document.getElementById(db) == null
&& window.frame_navigation.document.getElementById(db + '.' + table) == null ) { && window.frame_navigation.document.getElementById(db + '.' + table) == null ) {
// table or db is unknown, reload complete left frame // table or db is unknown, reload complete left frame
refreshLeft(); refreshNavigation();
} else { } else {
unmarkDbTable(old_db, old_table); unmarkDbTable(old_db, old_table);
markDbTable(db, table); markDbTable(db, table);

6
libraries/footer.inc.php
View File

@@ -31,8 +31,8 @@ if (window.parent.setAll) {
<?php if (! empty($GLOBALS['reload'])) { ?> <?php if (! empty($GLOBALS['reload'])) { ?>
// refresh navigation frame content // refresh navigation frame content
if (window.parent.refreshLeft) { if (window.parent.refreshNavigation) {
window.parent.refreshLeft(); window.parent.refreshNavigation();
} }
<?php } ?> <?php } ?>
@@ -52,7 +52,7 @@ if (! isset($GLOBALS['no_history']) && empty($GLOBALS['error_message'])) {
} }
?> ?>
// set current db, table and sql query in the querywindow // set current db, table and sql query in the querywindow
if (window.parent.refreshLeft) { if (window.parent.refreshNavigation) {
window.parent.reload_querywindow( window.parent.reload_querywindow(
"<?php echo isset($GLOBALS['db']) ? htmlspecialchars(addslashes($GLOBALS['db'])) : '' ?>", "<?php echo isset($GLOBALS['db']) ? htmlspecialchars(addslashes($GLOBALS['db'])) : '' ?>",
"<?php echo isset($GLOBALS['table']) ? htmlspecialchars(addslashes($GLOBALS['table'])) : '' ?>", "<?php echo isset($GLOBALS['table']) ? htmlspecialchars(addslashes($GLOBALS['table'])) : '' ?>",