From bfd0ffd2b53cbae63e362f8aff307b74b0dc7f28 Mon Sep 17 00:00:00 2001 From: Lionel Laffineur Date: Thu, 21 Sep 2023 20:57:52 +0200 Subject: [PATCH] Added a clipboard icon next to SQL command to expand and copy to clipboard --- adminer/include/adminer.inc.php | 2 +- adminer/static/functions.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 3b380035..34bc5d67 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -649,7 +649,7 @@ class Adminer { } $history[$_GET["db"]][] = array($query, time(), $time); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"] $sql_id = "sql-" . count($history[$_GET["db"]]); - $return = "" . lang('SQL command') . "\n"; + $return = "" . lang('SQL command') . " \n"; if (!$failed && ($warnings = $driver->warnings())) { $id = "warnings-" . count($history[$_GET["db"]]); $return = "" . lang('Warnings') . ", $return\n"; diff --git a/adminer/static/functions.js b/adminer/static/functions.js index 2eb2473d..65ab98b3 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -873,6 +873,9 @@ function setupCopyToClipboard(document) { nodeSql = document.querySelector("textarea.sqlarea"); } if (nodeSql != null && nodeSql != undefined) { + if (node.classList.contains('expand')) { + document.getElementById(node.getAttribute('data-expand-id')).classList.remove("hidden"); + } copyToClipboard(nodeSql); } }); @@ -883,6 +886,7 @@ function setupCopyToClipboard(document) { * @param HTMLElement */ function copyToClipboard(el) { + var nodeName = el.nodeName.toLowerCase(); if (nodeName == 'code') { var range = document.createRange();