Send select search form by Enter on <select>

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 5e3aa5fe27e72bcfca28af31e208611ded55d605..abb17cfdb9edffb58f23ba3ffa664a6570a2a6af 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -196,7 +196,7 @@ $adminer->selectLinks($table_status, $set);
 if (!$columns) {
        echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "." : ": " . error()) . "\n";
 } else {
-       echo "<form action='' id='form'>\n";
+       echo "<form action='' id='form' onkeydown='searchKeydown(this, event);'>\n";
        echo "<div style='display: none;'>";
        hidden_fields_get();
        echo (DB != "" ? '<input type="hidden" name="db" value="' . h(DB) . '">' . (isset($_GET["ns"]) ? '<input type="hidden" name="ns" value="' . h($_GET["ns"]) . '">' : "") : ""); // not used in Editor

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index be66f96d74e139b7fb87d6461aa6cf4c981e5b08..fa81e0fe19cb1a49623b849d63af367f4bb7b3d4 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -201,6 +201,17 @@ function textareaKeydown(target, event, tab, button) {
        return true;
 }
 
+/** Send form by Enter on <select>
+* @param HTMLFormElement
+* @param KeyboardEvent
+*/
+function searchKeydown(form, event) {
+       var target = event.target || event.srcElement;
+       if (/select/i.test(target.tagName) && (event.keyCode == 13 || event.keyCode == 10)) { // shiftKey and rest allowed
+               form.submit();
+       }
+}
+
 
 
 /** Change focus by Ctrl+Up or Ctrl+Down

diff --git a/changes.txt b/changes.txt
index 3b39e6a30d5de0062bbc51bf6928c5bdadad3a9a..322bbc6de2996da9927d0944804d57a8a478e48e 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -3,6 +3,7 @@ Ability to save expression in edit
 Respect default database collation (bug #3191489)
 Don't export triggers without table (bug #3193489)
 Esc to focus next field in Tab textarea (thanks to David Grudl)
+Send select search form by Enter on <select>
 Enum editor and textarea Ctrl+Enter working in IE
 AJAX forms in Google Chrome
 Parse UTF-16 and UTF-8 BOM in all text uploads