From de7a96467fd08daad93373ed4ef715bdabd640d3 Mon Sep 17 00:00:00 2001 From: Faissal Wahabali Date: Tue, 30 Apr 2024 20:08:56 +0100 Subject: [PATCH] Fix notification links (#18243) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix not working notification copy link Signed-off-by: faissaloux * fix not working notification links Signed-off-by: faissaloux * fix notification links tooltip messages Signed-off-by: faissaloux * update Edit Query message Signed-off-by: faissaloux * remove unused event param Signed-off-by: faissaloux * refactor Signed-off-by: faissaloux * revert Edit Query message Signed-off-by: faissaloux * refactor Signed-off-by: faissaloux * code style Signed-off-by: faissaloux * refactor Signed-off-by: faissaloux --------- Signed-off-by: faissaloux Fixes #18241 Signed-off-by: MaurĂ­cio Meneghini Fauth --- js/src/functions.js | 19 +++++++++++++++++++ .../JavaScriptMessagesController.php | 2 ++ 2 files changed, 21 insertions(+) diff --git a/js/src/functions.js b/js/src/functions.js index 635a8ad6e147..c954f00e67e1 100644 --- a/js/src/functions.js +++ b/js/src/functions.js @@ -2081,6 +2081,7 @@ $(function () { $(document).on('click', 'a.copyQueryBtn', function (event) { event.preventDefault(); + var res = Functions.copyToClipboard($(this).attr('data-text')); if (res) { $(this).after(' (' + Messages.strCopyQueryButtonSuccess + ')'); @@ -2091,6 +2092,24 @@ $(function () { $('#copyStatus').remove(); }, 2000); }); + + $(document).on('mouseover mouseleave', '.ajax_notification a', function (event) { + let message = Messages.strDismiss; + + if (event.type === 'mouseover') { + message = $(this).hasClass('copyQueryBtn') ? Messages.strCopyToClipboard : Messages.strEditQuery; + } + + Functions.tooltip( + $('.ajax_notification'), + 'span', + message + ); + }); + + $(document).on('mouseup', '.ajax_notification a', function (event) { + event.stopPropagation(); + }); }); /** diff --git a/libraries/classes/Controllers/JavaScriptMessagesController.php b/libraries/classes/Controllers/JavaScriptMessagesController.php index 49954638bb2e..63c4b5dc46f5 100644 --- a/libraries/classes/Controllers/JavaScriptMessagesController.php +++ b/libraries/classes/Controllers/JavaScriptMessagesController.php @@ -385,6 +385,7 @@ private function setMessages(): void 'strHideQueryBox' => __('Hide query box'), 'strShowQueryBox' => __('Show query box'), 'strEdit' => __('Edit'), + 'strEditQuery' => __('Edit query'), 'strDelete' => __('Delete'), 'strNotValidRowNumber' => __('%d is not valid row number.'), 'strBrowseForeignValues' => __('Browse foreign values'), @@ -472,6 +473,7 @@ private function setMessages(): void /* For table/change.js */ 'strIgnore' => __('Ignore'), + 'strCopyToClipboard' => __('Copy to clipboard'), 'strCopy' => __('Copy'), 'strX' => __('X'), 'strY' => __('Y'),