Ctrl+Shift+Enter for Save and continue edit

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 733778de863253095b529e7495df8f27de014b1c..2b84e3b6df671dd46598100df32682240bc7869d 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -94,7 +94,7 @@ if ($fields) {
 if ($fields) {
        echo "<input type='submit' value='" . lang('Save') . "'>\n";
        if (!isset($_GET["select"])) {
-               echo "<input type='submit' name='insert' value='" . ($update ? lang('Save and continue edit') : lang('Save and insert next')) . "' accesskey='Q' title='Alt+Shift+Q'>\n";
+               echo "<input type='submit' name='insert' value='" . ($update ? lang('Save and continue edit') : lang('Save and insert next')) . "'>\n";
        }
 }
 echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "' onclick=\"return confirm('" . lang('Are you sure?') . "');\">\n"

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index f06534885ef37cdd4c297b7b1321ec846dec6fc6..80d707bede2c1d001b41263ec57a931ff81704a3 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -199,15 +199,16 @@ function bodyKeydown(event, button) {
        var target = event.target || event.srcElement;
        if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey && /select|textarea|input/i.test(target.tagName)) { // 13|10 - Enter, shiftKey allowed
                target.blur();
-               if (ajaxForm(target.form, (button ? button + '=1' : ''))) {
-                       return false;
-               }
-               if (button) {
-                       target.form[button].click();
-               } else {
-                       target.form.submit();
+               if (!ajaxForm(target.form, (button ? button + '=1' : ''))) {
+                       if (button) {
+                               target.form[button].click();
+                       } else {
+                               target.form.submit();
+                       }
                }
+               return false;
        }
+       return true;
 }
 
 
@@ -226,6 +227,10 @@ function editingKeydown(event) {
                }
                return false;
        }
+       if (event.shiftKey && !bodyKeydown(event, 'insert')) {
+               eventStop(event);
+               return false;
+       }
        return true;
 }
 

diff --git a/changes.txt b/changes.txt
index ff73a8eb4f5ec7ff016c69c8e592046c22c35a94..0d0c67816aa28aade38cf3a219fa56ade9e21bb4 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -7,7 +7,7 @@ Bit type default value
 Display foreign key name in tooltip
 Display default column value in table overview
 Display column collation in tooltip
-Keyboard shortcuts: Alt+Shift+1 for homepage, Alt+Shift+Q for Save and continue edit
+Keyboard shortcuts: Alt+Shift+1 for homepage, Ctrl+Shift+Enter for Save and continue edit
 Pagination support (Oracle)
 Autocomplete for big foreign keys (Editor)
 Display name of the referenced record in PostgreSQL (Editor)