Utilize bodyKeydown function

diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 90f720e4c23a7d0d979b3ce7dcd95e68781eae51..38b24c8603c33863576bc2051b0f6bd58c0db05b 100644 (file)
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -57,7 +57,7 @@ if ($_POST) {
 <p>
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
-       ? '<textarea id="name" name="name" rows="10" cols="40" onkeydown="return textareaKeydown(this, event);">' . h($name) . '</textarea><br>'
+       ? '<textarea id="name" name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
        : '<input id="name" name="name" value="' . h($name) . '" maxlength="64">'
 ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate) : "");
 ?>

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 4703be495ffff4e0facdea685d3961ffc67d2c9b..bb692d2ae8cf141cc7d683d4ec398155bc9d7569 100644 (file)
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -218,7 +218,7 @@ if (DB != "") {
                        }
                }
        } else {
-               echo "<tr><td><textarea name='databases' rows='10' cols='20' onkeydown='return textareaKeydown(this, event);'></textarea>";
+               echo "<tr><td><textarea name='databases' rows='10' cols='20'></textarea>";
        }
 }
 ?>

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 7dc9240a16909bd0f15287ad44998972e94d365a..ccb2a95fc4c0379a9dd2331c0c8b19a3b241bce4 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -106,7 +106,7 @@ function referencable_primary($self) {
 * @return null
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
-       echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea' spellcheck='false' wrap='off' onkeydown='return textareaKeydown(this, event, true);'>"; // spellcheck, wrap - not valid before HTML5
+       echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea' spellcheck='false' wrap='off' onkeydown='return textareaKeydown(this, event);'>"; // spellcheck, wrap - not valid before HTML5
        if (is_array($value)) {
                foreach ($value as $val) { // not implode() to save memory
                        echo h($val) . ";\n\n\n"; // rtrim(, ';') would possibly damage DELIMITER

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index e32e8db7765e620c017bea3d9d0120b08222c0f8..47ccdae358094b4f966d4d4c9a6e72256ffa2b30 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -689,7 +689,7 @@ function input($field, $value, $function) {
                } elseif (ereg('blob|bytea|raw|file', $field["type"]) && ini_bool("file_uploads")) {
                        echo "<input type='file' name='fields-$name'$onchange>";
                } elseif (ereg('text|lob', $field["type"])) {
-                       echo "<textarea " . ($jush != "sqlite" || ereg("\n", $value) ? "cols='50' rows='12'" : "cols='30' rows='1' style='height: 1.2em;'") . "$attrs onkeydown='return textareaKeydown(this, event);'>" . h($value) . '</textarea>'; // 1.2em - line-height
+                       echo "<textarea " . ($jush != "sqlite" || ereg("\n", $value) ? "cols='50' rows='12'" : "cols='30' rows='1' style='height: 1.2em;'") . "$attrs>" . h($value) . '</textarea>'; // 1.2em - line-height
                } else {
                        // int(3) is only a display hint
                        $maxlength = (!ereg('int', $field["type"]) && preg_match('~^(\\d+)(,(\\d+))?$~', $field["length"], $match) ? ((ereg("binary", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 914f38e06981e2a429b0ccf8c66b407c9731a084..a7d85d71dd1c54f300aef5a881b31cb8c173c236 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -349,7 +349,7 @@ if (!$columns) {
                                                $editable = is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
                                                $text = ereg('text|lob', $field["type"]);
                                                echo (($_GET["modify"] && $editable) || isset($value)
-                                                       ? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "' onkeydown='return textareaKeydown(this, event);'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
+                                                       ? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
                                                        : "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($long ? ", 2" : ($text ? ", 1" : "")) . ")" : "alert('" . h(lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
                                                );
                                        }

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 867aa8a3430876a0626c82e7f044b69c187901ff..7e2f39ff49a5dfcec66a0b5f740079311962693a 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -157,14 +157,13 @@ function selectAddRow(field) {
 
 
 
-/** Handle Ctrl+Enter and optionally Tab in textarea
+/** Handle Tab and Esc in textarea
 * @param HTMLTextAreaElement
 * @param KeyboardEvent
-* @param boolean handle also Tab
 * @return boolean
 */
-function textareaKeydown(target, event, tab) {
-       if (tab && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
+function textareaKeydown(target, event) {
+       if (!event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
                if (event.keyCode == 9) { // 9 - Tab
                        // inspired by http://pallieter.org/Projects/insertTab/
                        if (target.setSelectionRange) {
@@ -187,6 +186,7 @@ function textareaKeydown(target, event, tab) {
                                        break;
                                }
                        }
+                       return false;
                }
        }
        return true;
@@ -421,9 +421,6 @@ function selectDblClick(td, event, text) {
                        rows++;
                });
                input.rows = rows;
-               input.onkeydown = function (event) {
-                       return textareaKeydown(input, event || window.event);
-               };
        }
        if (document.selection) {
                var range = document.selection.createRange();

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index eed82cc631379bbfaaaa045c6de74a7903b79c1c..63a28d53cd1f3598a02e3b6caf3a4805f54eb94a 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -281,7 +281,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                        print_fieldset("email", lang('E-mail'), $_POST["email_append"]);
                        echo "<p>" . lang('From') . ": <input name='email_from' value='" . h($_POST ? $_POST["email_from"] : $_COOKIE["adminer_email"]) . "'>\n";
                        echo lang('Subject') . ": <input name='email_subject' value='" . h($_POST["email_subject"]) . "'>\n";
-                       echo "<p><textarea name='email_message' rows='15' cols='75' onkeydown='return textareaKeydown(this, event, false, this.form.email);'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea><br>\n";
+                       echo "<p><textarea name='email_message' rows='15' cols='75'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea><br>\n"; //! Ctrl+Enter for this.form.email
                        echo html_select("email_addition", $columns, $_POST["email_addition"]) . "<input type='submit' name='email_append' value='" . lang('Insert') . "'>\n"; //! JavaScript
                        echo "<p>" . lang('Attachments') . ": <input type='file' name='email_files[]' onchange=\"this.onchange = function () { }; var el = this.cloneNode(true); el.value = ''; this.parentNode.appendChild(el);\">";
                        echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . h(key($emailFields)) . '">' : html_select("email_field", $emailFields));

diff --git a/plugins/edit-textarea.php b/plugins/edit-textarea.php
index d9245618b7a8d623aee75352e4b3828d88eaf7f8..c2f1c421a85a3311d32deccf9f6b97afb067120a 100644 (file)
--- a/plugins/edit-textarea.php
+++ b/plugins/edit-textarea.php
@@ -9,7 +9,7 @@ class AdminerEditTextarea {
        
        function editInput($table, $field, $attrs, $value) {
                if (ereg('char', $field["type"])) {
-                       return "<textarea cols='30' rows='1' style='height: 1.2em;'$attrs onkeydown='return textareaKeydown(this, event);'>" . h($value) . '</textarea>';
+                       return "<textarea cols='30' rows='1' style='height: 1.2em;'$attrs>" . h($value) . '</textarea>';
                }
        }