Use Esc to disable in-place edit (bug #3299578)

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 41d78998d76c03f66e061a55b20a348323e21b98..21dd60d2ce930519df524da05f04c8d92d31c1d3 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -384,10 +384,21 @@ function ajaxForm(form, data) {
 * @param number display textarea instead of input, 2 - load long text
 */
 function selectDblClick(td, event, text) {
-       td.ondblclick = function () { };
-       var pos = event.rangeOffset;
-       var value = (td.firstChild.alt ? td.firstChild.alt : (td.textContent ? td.textContent : td.innerText));
+       if (/input|textarea/i.test(td.firstChild.tagName)) {
+               return;
+       }
+       var original = td.innerHTML;
        var input = document.createElement(text ? 'textarea' : 'input');
+       input.onkeydown = function (event) {
+               if (!event) {
+                       event = window.event;
+               }
+               if (event.keyCode == 27 && !(event.ctrlKey || event.shiftKey || event.altKey || event.metaKey)) { // 27 - Esc
+                       td.innerHTML = original;
+               }
+       };
+       var pos = event.rangeOffset;
+       var value = td.firstChild.alt || td.textContent || td.innerText;
        input.style.width = Math.max(td.clientWidth - 14, 20) + 'px'; // 14 = 2 * (td.border + td.padding + input.border)
        if (text) {
                var rows = 1;

diff --git a/changes.txt b/changes.txt
index e366752ca49f20002b2c4947f42161a1ec562198..518684a33173e8fbe255397ab3e911a331eb9f9a 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 3.3.0-dev:
+Use Esc to disable in-place edit
 Highlight SQL code in textarea
 Append new index with auto index selection (bug #3282127)
 Autocomplete for big foreign keys (Editor)