Allow searching data in tables by Ctrl+Enter

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index c17f0807b682e91e8a1c247a048e1ce0c48af7cd..179665478c651cafe24600cedaa4a4fbf34d8c39 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -56,7 +56,9 @@ if ($adminer->homepage()) {
                        echo "<form action='' method='post'>\n";
                        if (support("table")) {
                                echo "<fieldset><legend>" . lang('Search data in tables') . " <span id='selected2'></span></legend><div>";
-                               echo "<input type='search' name='query' value='" . h($_POST["query"]) . "'> <input type='submit' name='search' value='" . lang('Search') . "'>\n";
+                               echo "<input type='search' name='query' value='" . h($_POST["query"]) . "'>";
+                               echo script("qsl('input').onkeydown = partialArg(bodyKeydown, 'search');", "");
+                               echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
                                echo "</div></fieldset>\n";
                                if ($_POST["search"] && $_POST["query"] != "") {
                                        search_tables();

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index d1e976717b109ed9837342c68478da24916225d2..566ee77082fe87b8670436591652bc832fe40f09 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -462,6 +462,7 @@ function getTarget(event) {
 * @return boolean
 */
 function bodyKeydown(event, button) {
+       eventStop(event);
        var target = getTarget(event);
        if (target.jushTextarea) {
                target = target.jushTextarea;
@@ -510,7 +511,6 @@ function editingKeydown(event) {
                return false;
        }
        if (event.shiftKey && !bodyKeydown(event, 'insert')) {
-               eventStop(event);
                return false;
        }
        return true;

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 3ef1fca573f6a352df3e2635c0a335387d88c585..c65bd78d3a854dd72c7c71de2fe03f5d69f59c5f 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -304,11 +304,11 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
        function selectEmailPrint($emailFields, $columns) {
                if ($emailFields) {
                        print_fieldset("email", lang('E-mail'), $_POST["email_append"]);
-                       echo "<div onkeydown=\"eventStop(event); return bodyKeydown(event, 'email');\">\n";
+                       echo "<div onkeydown=\"return bodyKeydown(event, 'email');\">\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>\n";
-                       echo "<p onkeydown=\"eventStop(event); return bodyKeydown(event, 'email_append');\">" . html_select("email_addition", $columns, $_POST["email_addition"]) . "<input type='submit' name='email_append' value='" . lang('Insert') . "'>\n"; //! JavaScript
+                       echo "<p onkeydown=\"return bodyKeydown(event, 'email_append');\">" . 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));
                        echo "<input type='submit' name='email' value='" . lang('Send') . "' onclick=\"return this.form['delete'].onclick();\">\n";

diff --git a/plugins/email-table.php b/plugins/email-table.php
index a8c375df7920643b5416daccd471474cc55d5eaa..ef2f2760e4c40cc963607e14127513e2cf0df759 100644 (file)
--- a/plugins/email-table.php
+++ b/plugins/email-table.php
@@ -28,7 +28,7 @@ class AdminerEmailTable {
        function selectEmailPrint($emailFields, $columns) {
                if ($emailFields) {
                        print_fieldset("email", ('E-mail'));
-                       echo "<div onkeydown=\"eventStop(event); return bodyKeydown(event, 'email');\">\n";
+                       echo "<div onkeydown=\"return bodyKeydown(event, 'email');\">\n";
                        echo "<p>" . ('From') . ": <input name='email_from' value='" . h($_POST ? $_POST["email_from"] : $_COOKIE["adminer_email"]) . "'>\n";
                        echo ('Subject') . ": <select name='email_id'><option>" . optionlist(get_key_vals("SELECT $this->id, $this->title FROM $this->table ORDER BY $this->title"), $_POST["email_id"], true) . "</select>\n";
                        echo "<p>" . ('Attachments') . ": <input type='file' name='email_files[]' onchange=\"this.onchange = function () { }; var el = this.cloneNode(true); el.value = ''; this.parentNode.appendChild(el);\">";