Don't edit for Ctrl+click on link

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 422014ba8a6330768e6a5c006287f92d0828c04f..b3697724450862179f525ed3cab259dd9222214f 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -403,7 +403,7 @@ if (!$columns) {
                                                $text = ereg('text|lob', $field["type"]);
                                                echo (($_GET["modify"] && $editable) || $value !== null
                                                        ? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
-                                                       : "<td id='$id' onclick=\"" . ($editable ? "selectClick(this, event" . ($long ? ", 2" : ($text ? ", 1" : "")) . ")" : "if (event.ctrlKey) alert('" . h(lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
+                                                       : "<td id='$id' onclick=\"selectClick(this, event, " . ($long ? 2 : ($text ? 1 : 0)) . ($editable ? "" : ", '" . h(lang('Use edit link to modify this value.')) . "'") . ");\">" . $adminer->selectVal($val, $link, $field)
                                                );
                                        }
                                }

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index a1f563d01c3000502ee4acf9fd759367df632aba..7bb56851850395366637b08927f066a754c3d753 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -412,11 +412,16 @@ function ajaxSetHtml(url) {
 * @param HTMLElement
 * @param MouseEvent
 * @param number display textarea instead of input, 2 - load long text
+* @param string warning to display
 */
-function selectClick(td, event, text) {
-       if (!event.ctrlKey || /input|textarea/i.test(td.firstChild.tagName)) {
+function selectClick(td, event, text, warning) {
+       var target = event.target || event.srcElement;
+       if (!event.ctrlKey || /input|textarea/i.test(td.firstChild.tagName) || /^a$/i.test(target.tagName)) {
                return;
        }
+       if (warning) {
+               return alert(warning);
+       }
        var original = td.innerHTML;
        text = text || /\n/.test(original);
        var input = document.createElement(text ? 'textarea' : 'input');