From e0773c0072a00db47ab5a02ee17b419a2484391c Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 14 Jun 2011 10:32:08 +0200
Subject: [PATCH] Ctrl+Shift+Enter for Save and continue edit

---
 adminer/edit.inc.php        |  2 +-
 adminer/static/functions.js | 19 ++++++++++++-------
 changes.txt                 |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 733778de..2b84e3b6 100644
--- 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 f0653488..80d707be 100644
--- 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 ff73a8eb..0d0c6781 100644
--- 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)