bug #1477576 with rtl langs, navi links open in wrong frame

This commit is contained in:
Sebastian Mendel
2006-07-03 14:32:15 +00:00
parent 745e33bafd
commit cd00d5f600
2 changed files with 23 additions and 12 deletions

View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-07-03 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/footer.inc.php: bug #1477576 with rtl langs, navi links open in
wrong frame
2006-07-02 Marc Delisle <lem9@users.sourceforge.net> 2006-07-02 Marc Delisle <lem9@users.sourceforge.net>
* db_operations.php: undefined $table when copying a db * db_operations.php: undefined $table when copying a db

View File

@@ -65,19 +65,26 @@ if (window.parent.refreshLeft) {
if (parent.querywindow && !parent.querywindow.closed && parent.querywindow.location) { if (parent.querywindow && !parent.querywindow.closed && parent.querywindow.location) {
self.focus(); self.focus();
} }
<?php } ?> <?php }
if (window.parent.frames[1]) { if ($GLOBALS['text_dir'] === 'ltr') {
$mainframe_number = 1;
} else {
$mainframe_number = 0;
}
?>
if (window.parent.frames[<?php echo $mainframe_number; ?>]) {
// reset content frame name, as querywindow needs to set a unique name // reset content frame name, as querywindow needs to set a unique name
// before submitting form data, and navigation frame needs the original name // before submitting form data, and navigation frame needs the original name
if (window.parent.frames[1].name != 'frame_content') { if (window.parent.frames[<?php echo $mainframe_number; ?>].name != 'frame_content') {
window.parent.frames[1].name = 'frame_content'; window.parent.frames[<?php echo $mainframe_number; ?>].name = 'frame_content';
} }
if (window.parent.frames[1].id != 'frame_content') { if (window.parent.frames[<?php echo $mainframe_number; ?>].id != 'frame_content') {
window.parent.frames[1].id = 'frame_content'; window.parent.frames[<?php echo $mainframe_number; ?>].id = 'frame_content';
} }
//window.parent.frames[1].setAttribute('name', 'frame_content'); //window.parent.frames[<?php echo $mainframe_number; ?>].setAttribute('name', 'frame_content');
//window.parent.frames[1].setAttribute('id', 'frame_content'); //window.parent.frames[<?php echo $mainframe_number; ?>].setAttribute('id', 'frame_content');
} }
//]]> //]]>
</script> </script>