diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php index f380fcef..b96177ca 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -28,7 +28,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") { -');" onload="bodyLoad('server_info, 0, 3) : ""); ?>');"> +');" onkeydown="bodyKeydown(event);" onload="bodyLoad('server_info, 0, 3) : ""); ?>');"> diff --git a/adminer/select.inc.php b/adminer/select.inc.php index abb17cfd..914f38e0 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -196,7 +196,7 @@ $adminer->selectLinks($table_status, $set); if (!$columns) { echo "

" . lang('Unable to select the table') . ($fields ? "." : ": " . error()) . "\n"; } else { - echo "

\n"; + echo "\n"; echo "
"; hidden_fields_get(); echo (DB != "" ? '' . (isset($_GET["ns"]) ? '' : "") : ""); // not used in Editor @@ -394,7 +394,7 @@ if (!$columns) { if (!information_schema(DB)) { ?>
- + diff --git a/adminer/static/functions.js b/adminer/static/functions.js index b9f2898d..867aa8a3 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -161,10 +161,9 @@ function selectAddRow(field) { * @param HTMLTextAreaElement * @param KeyboardEvent * @param boolean handle also Tab -* @param HTMLInputElement submit button * @return boolean */ -function textareaKeydown(target, event, tab, button) { +function textareaKeydown(target, event, tab) { if (tab && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) { if (event.keyCode == 9) { // 9 - Tab // inspired by http://pallieter.org/Projects/insertTab/ @@ -190,26 +189,21 @@ function textareaKeydown(target, event, tab, button) { } } } - if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey) { // 13|10 - Enter, shiftKey allowed - target.blur(); - if (button) { - button.click(); - } else if ((!target.form.onsubmit || target.form.onsubmit() !== false) && !ajaxForm(target.form)) { - target.form.submit(); - } - return false; - } return true; } /** Send form by Enter on +Send forms by Ctrl+Enter on