diff options
| author | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2007-10-05 15:45:55 +0400 |
|---|---|---|
| committer | Sebastian Mendel <cybot_tm@users.sourceforge.net> | 2007-10-05 15:45:55 +0400 |
| commit | 98c8a7719e6c51c5b1b34d46f28942b5d5afe69d (patch) | |
| tree | 8d5b26eb8b489b530d745c5b489854426957dc88 /querywindow.php | |
| parent | 092d6752550dd96c666c87947b5bf1f71f2ed47f (diff) | |
refactored JavaScript handling
Diffstat (limited to 'querywindow.php')
| -rw-r--r-- | querywindow.php | 81 |
1 files changed, 22 insertions, 59 deletions
diff --git a/querywindow.php b/querywindow.php index 2e346f4754..7305bac6a9 100644 --- a/querywindow.php +++ b/querywindow.php @@ -163,74 +163,37 @@ if (! empty($show_query)) { $sql_query = ''; /** - * start HTML output + * prepare JavaScript functionality */ -require_once './libraries/header_http.inc.php'; -require_once './libraries/header_meta_style.inc.php'; -?> -<script type="text/javascript"> -//<![CDATA[ -var PMA_messages = new Array(); -PMA_messages['strFormEmpty'] = '<?php echo PMA_escapeJsString($GLOBALS['strFormEmpty']); ?>'; -PMA_messages['strNotNumber'] = '<?php echo PMA_escapeJsString($GLOBALS['strNotNumber']); ?>'; -PMA_messages['strNoDropDatabases'] = '<?php echo (!$is_superuser && !$GLOBALS['cfg']['AllowUserDropDatabase']) - ? PMA_escapeJsString($GLOBALS['strNoDropDatabases']) : ''; ?>'; -PMA_messages['strDoYouReally'] = '<?php echo $GLOBALS['cfg']['Confirm'] - ? PMA_escapeJsString($GLOBALS['strDoYouReally']) : ''; ?>'; - -function PMA_queryAutoCommit() { - document.getElementById('sqlqueryform').target = window.opener.frame_content.name; - document.getElementById('sqlqueryform').submit(); - return; -} - -function PMA_querywindowCommit(tab) { - document.getElementById('hiddenqueryform').querydisplay_tab.value = tab; - document.getElementById('hiddenqueryform').submit(); - return false; -} - -function PMA_querywindowResize() { - // for Gecko - if (typeof(self.sizeToContent) == 'function') { - self.sizeToContent(); - //self.scrollbars.visible = false; - // give some more space ... to prevent 'fli(pp/ck)ing' - self.resizeBy(10, 50); - return; - } - - // for IE, Opera - if (document.getElementById && typeof(document.getElementById('querywindowcontainer')) != 'undefined') { - - // get content size - var newWidth = document.getElementById('querywindowcontainer').offsetWidth; - var newHeight = document.getElementById('querywindowcontainer').offsetHeight; +$js_include[] = 'common.js'; +$js_include[] = 'functions.js'; +$js_include[] = 'querywindow.js'; - // set size to contentsize - // plus some offset for scrollbars, borders, statusbar, menus ... - self.resizeTo(newWidth + 45, newHeight + 75); - } -} - -function PMA_querywindowInit() -{ -<?php if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { - echo 'PMA_queryAutoCommit();' . "\n"; + $js_events[] = array( + 'object' => 'window', + 'event' => 'load', + 'function' => 'PMA_queryAutoCommit', + ); } if (PMA_isValid($_REQUEST['init'])) { - echo 'PMA_querywindowResize();' . "\n"; -} -?> + $js_events[] = array( + 'object' => 'window', + 'event' => 'load', + 'function' => 'PMA_querywindowResize', + ); } -//]]> -</script> -<script src="./js/functions.js" type="text/javascript"></script> +/** + * start HTTP/HTML output + */ +require_once './libraries/header_http.inc.php'; +require_once './libraries/header_meta_style.inc.php'; +require_once './libraries/header_scripts.inc.php'; +?> </head> -<body id="bodyquerywindow" onload="PMA_querywindowInit();"> +<body id="bodyquerywindow"> <div id="querywindowcontainer"> <?php |