diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php index 0a26cf33..8d1a8721 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -96,6 +96,17 @@ function referencable_primary($self) { return $return; } +/** Print SQL "; // spellcheck - not valid before HTML5 +} + /** Print table columns for type edit * @param string * @param array diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index cf052a3c..5f475232 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -116,17 +116,6 @@ function html_select($name, $options, $value = "", $onchange = true) { return $return; } -/** Print SQL "; // spellcheck - not valid before HTML5 -} - // other functions diff --git a/adminer/static/editing.js b/adminer/static/editing.js index 4a3f03bd..3e6952be 100644 --- a/adminer/static/editing.js +++ b/adminer/static/editing.js @@ -407,3 +407,27 @@ function schemaMouseup(ev) { cookie('adminer_schema=' + encodeURIComponent(s.substr(1)), 30, '; path="' + location.pathname + location.search + '"'); } } + +/** Handle Tab and Ctrl+Enter in textarea +* @param HTMLTextAreaElement +* @param KeyboardEvent +* @return boolean +*/ +function textareaKeydown(target, event) { + if (event.keyCode == 9 && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) { + // inspired by http://pallieter.org/Projects/insertTab/ + if (target.setSelectionRange) { + var start = target.selectionStart; + target.value = target.value.substr(0, start) + '\t' + target.value.substr(target.selectionEnd); + target.setSelectionRange(start + 1, start + 1); + return false; + } else if (target.createTextRange) { + document.selection.createRange().text = '\t'; + return false; + } + } + if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey) { // shiftKey allowed + target.form.submit(); + } + return true; +} diff --git a/adminer/static/functions.js b/adminer/static/functions.js index 874e37f6..f610ab8d 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -123,30 +123,6 @@ function selectAddRow(field) { -/** Handle Tab and Ctrl+Enter in textarea -* @param HTMLTextAreaElement -* @param KeyboardEvent -* @return boolean -*/ -function textareaKeydown(target, event) { - if (event.keyCode == 9 && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) { - // inspired by http://pallieter.org/Projects/insertTab/ - if (target.setSelectionRange) { - var start = target.selectionStart; - target.value = target.value.substr(0, start) + '\t' + target.value.substr(target.selectionEnd); - target.setSelectionRange(start + 1, start + 1); - return false; - } else if (target.createTextRange) { - document.selection.createRange().text = '\t'; - return false; - } - } - if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey) { // shiftKey allowed - target.form.submit(); - } - return true; -} - /** Display edit field