From fcc773660ec7d582be87ec2eb9226384d571b29a Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 10 May 2011 11:06:50 +0200 Subject: [PATCH] Use Esc to disable in-place edit (bug #3299578) --- adminer/static/functions.js | 17 ++++++++++++++--- changes.txt | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/adminer/static/functions.js b/adminer/static/functions.js index 41d78998..21dd60d2 100644 --- 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 e366752c..518684a3 100644 --- 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)