Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Apr 30, 2024 · 85c8385 · 85c8385
2 parents 8cf3e5a + de7a964
commit 85c8385
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/resources/js/src/modules/functions.ts b/resources/js/src/modules/functions.ts
@@ -1529,6 +1529,24 @@ function dismissNotifications () {
             var copyStatus = Functions.copyToClipboard($(this).attr('data-text'));
             displayCopyStatus(this, copyStatus);
         });
+
+        $(document).on('mouseover mouseleave', '.ajax_notification a', function (event) {
+            let message = window.Messages.strDismiss;
+
+            if (event.type === 'mouseover') {
+                message = $(this).hasClass('copyQueryBtn') ? window.Messages.strCopyToClipboard : window.Messages.strEditQuery;
+            }
+
+            tooltip(
+                $('.ajax_notification'),
+                'span',
+                message
+            );
+        });
+
+        $(document).on('mouseup', '.ajax_notification a', function (event) {
+            event.stopPropagation();
+        });
     };
 }
 

diff --git a/src/Controllers/JavaScriptMessagesController.php b/src/Controllers/JavaScriptMessagesController.php
@@ -398,6 +398,7 @@ private function getMessages(): array
             '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'),
@@ -485,6 +486,7 @@ private function getMessages(): array
 
             /* For table/change.js */
             'strIgnore' => __('Ignore'),
+            'strCopyToClipboard' => __('Copy to clipboard'),
             'strCopy' => __('Copy'),
             'strX' => __('X'),
             'strY' => __('Y'),