Don't select row on double click

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 10e626fc191c633dcf122c0b8ea314264b3e0d76..29a2bab7e45219cdadce592841517af54fb7fa9f 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -54,7 +54,7 @@ if ($adminer->homepage()) {
                        if ($_POST["search"] && $_POST["query"] != "") {
                                search_tables();
                        }
-                       echo "<table cellspacing='0' class='nowrap checkable' onclick='tableClick(event);'>\n";
+                       echo "<table cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\n";
                        echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="formCheck(this, /^(tables|views)\[/);">';
                        echo '<th>' . lang('Table');
                        echo '<td>' . lang('Engine');

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index c0ce43d957efb32a5a78846ba270c1b81878fb0f..0ecae00b25c0e5b851f14620f7311e3592bccce1 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -29,7 +29,7 @@ function connect_error() {
                        $scheme = support("scheme");
                        $collations = collations();
                        echo "<form action='' method='post'>\n";
-                       echo "<table cellspacing='0' class='checkable' onclick='tableClick(event);'>\n";
+                       echo "<table cellspacing='0' class='checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\n";
                        echo "<thead><tr><td>&nbsp;<th>" . lang('Database') . "<td>" . lang('Collation') . "<td>" . lang('Tables') . "</thead>\n";
                        foreach ($databases as $db) {
                                $root = h(ME) . "db=" . urlencode($db);

diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index 84c136065b259609e2692af9ac4de50f4bb96de5..39832da07485e471ccf486a67b0340bbb8ec9a7e 100644 (file)
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -13,7 +13,7 @@ page_header(lang('Process list'), $error);
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" onclick="tableClick(event);" class="nowrap checkable">
+<table cellspacing="0" onclick="tableClick(event);" ondblclick="tableClick(event, true);" class="nowrap checkable">
 <?php
 // HTML valid because there is always at least one process
 $i = -1;

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 706c1fab6f4fdad79f45c98f6f5ef8adcc055e8d..0952f70cb76abab3c103d8f439f296d5365b5248 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -282,7 +282,7 @@ if (!$columns) {
                } else {
                        $backward_keys = $adminer->backwardKeys($TABLE, $table_name);
                        
-                       echo "<table id='table' cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' onkeydown='return editingKeydown(event);'>\n";
+                       echo "<table id='table' cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);' onkeydown='return editingKeydown(event);'>\n";
                        echo "<thead><tr>" . (!$group && $select ? "" : "<td><input type='checkbox' id='all-page' onclick='formCheck(this, /check/);'> <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('edit') . "</a>");
                        $names = array();
                        $functions = array();

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 2694518eea29105fd414fedb3d0f675961179096..a1f563d01c3000502ee4acf9fd759367df632aba 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -114,9 +114,10 @@ function formChecked(el, name) {
 
 /** Select clicked row
 * @param MouseEvent
+* @param [boolean] force click
 */
-function tableClick(event) {
-       var click = (!window.getSelection || getSelection().isCollapsed);
+function tableClick(event, click) {
+       click = (click || !window.getSelection || getSelection().isCollapsed);
        var el = event.target || event.srcElement;
        while (!/^tr$/i.test(el.tagName)) {
                if (/^(table|a|input|textarea)$/i.test(el.tagName)) {
@@ -130,7 +131,7 @@ function tableClick(event) {
        }
        el = el.firstChild.firstChild;
        if (click) {
-               el.click && el.click();
+               el.checked = !el.checked;
                el.onclick && el.onclick();
        }
        trCheck(el);

diff --git a/changes.txt b/changes.txt
index c44150238a2d777387edd20a4afbb6892e02da52..474b6f9ae760a35a23c0ee1f6fa9c1fd1d18c891 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 3.6.2-dev:
 Edit values by Ctrl+click instead of double click
+Don't select row on double click
 Shorten values in varchar fields
 Display table default values on wide screens
 Fix switching language on first load