Send the form by Ctrl+Enter in all textareas

diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index f3399dee22f66b875d0c0dcb97efab6ca9cb2d3d..eb9f6ac37db7eba9d9c543cc0ae47286d7639aec 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 name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
+       ? '<textarea name="name" rows="10" cols="40" onkeydown="return textareaKeydown(this, event);">' . h($name) . '</textarea><br>'
        : '<input 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 8004b7199f879aeb61106f25df98b1390713f552..b813f87a51663e8f4317cd935efd52bf65801601 100644 (file)
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -214,7 +214,7 @@ if (DB != "") {
                        }
                }
        } else {
-               echo "<tr><td><textarea name='databases' rows='10' cols='20'></textarea>";
+               echo "<tr><td><textarea name='databases' rows='10' cols='20' onkeydown='return textareaKeydown(this, event);'></textarea>";
        }
 }
 ?>

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 38bc423f8420b414e4e27a9c79d8dc044d78434e..cf4ba18bce1197c5dd9d9fabed4a479c2d017fa2 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -104,7 +104,7 @@ function referencable_primary($self) {
 * @return null
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
-       echo "<textarea name='$name' rows='$rows' cols='$cols' style='width: 98%;' spellcheck='false' onkeydown='return textareaKeydown(this, event);'>" . h($value) . "</textarea>"; // spellcheck - not valid before HTML5
+       echo "<textarea name='$name' rows='$rows' cols='$cols' style='width: 98%;' spellcheck='false' onkeydown='return textareaKeydown(this, event, true);'>" . h($value) . "</textarea>"; // spellcheck - not valid before HTML5
 }
 
 /** Print table columns for type edit

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index ea81a1c914e08a70d50419631e6f37d52237939a..88e51ad27138f799d702fde0310da038e788ccce 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -599,7 +599,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>" . 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 onkeydown='return textareaKeydown(this, event);'>" . h($value) . '</textarea>'; // 1.2em - line-height
                } else {
                        // int(3) is only a display hint
                        $maxlength = (!ereg('int', $field["type"]) && preg_match('~^([0-9]+)(,([0-9]+))?$~', $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 363ef22a48fbd8c98aac565c83ee3105fff7d5cc..0c174503e9cd5178506dcc7f13fa995d32a40e96 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -339,7 +339,7 @@ if (!$columns) {
                                                $editable = is_utf8($val) && !$long && $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) . "'>$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) . "' onkeydown='return textareaKeydown(this, event);'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
                                                        : "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($text ? ", 1" : "") . ")" : "alert('" . h($long ? lang('Increase text length to modify this value.') : lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
                                                );
                                        }

diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index c1585b6706fead485887e4bcdac4dfea9c4fdaa3..99c10569c19a69610d8f18bb145365fda78a7cca 100644 (file)
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -408,27 +408,3 @@ 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; //! still loses focus in Opera, can be solved by handling onblur
-               } 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 f610ab8d8db152b159a7c2e241e6bc2581352670..ca4332a5f37ddb973855630af5326cc4ca44ff80 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -123,7 +123,35 @@ function selectAddRow(field) {
 
 
 
-
+/** Handle Ctrl+Enter and optionally Tab in textarea
+* @param HTMLTextAreaElement
+* @param KeyboardEvent
+* @param boolean handle also Tab
+* @param HTMLInputElement submit button
+* @return boolean
+*/
+function textareaKeydown(target, event, tab, button) {
+       if (tab && 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; //! still loses focus in Opera, can be solved by handling onblur
+               } 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
+               if (button) {
+                       button.click();
+               } else {
+                       target.form.submit();
+               }
+       }
+       return true;
+}
 
 /** Display edit field
 * @param HTMLElement
@@ -143,6 +171,9 @@ 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/changes.txt b/changes.txt
index 3e7f1369848160a17a4df6e720c2747f225f2457..716b9d2ece30a67b234d7b24e10232c68501c0bb 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 3.0.1-dev:
+Send the form by Ctrl+Enter in all textareas
 Catalan translation
 
 Adminer 3.0.0 (released 2010-10-15):

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 8c8d990d2bc70d1dae10b6d08c5a60d88e558100..e7c747607eba550b3c9225a64786c04771619bcc 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -265,7 +265,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                        echo '<fieldset><legend><a href="#fieldset-email" onclick="return !toggle(\'fieldset-email\');">' . lang('E-mail') . "</a></legend><div id='fieldset-email'" . ($_POST["email_append"] ? "" : " class='hidden'") . ">\n";
                        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'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea><br>\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 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=\"var el = this.cloneNode(true); el.value = ''; this.parentNode.appendChild(el); this.onchange = function () { };\">";
                        echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . h(key($emailFields)) . '">' : html_select("email_field", $emailFields));