Merge #19960 - Fix #19950 - Dispose tooltips when Enter is pressed

williamdes · williamdes · commit 3c8ea249b5fc · 2025-12-25T17:09:39.000+01:00
Pull-request: #19960 Fixes: #19950 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/resources/js/modules/ajax-message.ts b/resources/js/modules/ajax-message.ts
@@ -96,6 +96,7 @@ const ajaxShowMessage = function (message = null, timeout = null, type = null) {
     // Update message count to create distinct message elements every time
     ajaxMessageCount++;
     // Remove all old messages, if any
+    $('[role="tooltip"]').remove();
     $('span.ajax_notification[id^=ajax_message_num]').remove();
     /**
      * @var $retval    a jQuery object containing the reference
diff --git a/resources/js/modules/functions.ts b/resources/js/modules/functions.ts
@@ -198,10 +198,10 @@ export function addDateTimePicker () {
 
         // Add a tip regarding entering MySQL allowed-values for TIME and DATE data-type
         if (this.classList.contains('timefield')) {
-            bootstrap.Tooltip.getOrCreateInstance(this, { title: window.Messages.strMysqlAllowedValuesTipTime })
+            bootstrap.Tooltip.getOrCreateInstance(this, { title: window.Messages.strMysqlAllowedValuesTipTime, trigger: 'hover' })
                 .setContent({ '.tooltip-inner': window.Messages.strMysqlAllowedValuesTipTime });
         } else if (this.classList.contains('datefield')) {
-            bootstrap.Tooltip.getOrCreateInstance(this, { title: window.Messages.strMysqlAllowedValuesTipDate })
+            bootstrap.Tooltip.getOrCreateInstance(this, { title: window.Messages.strMysqlAllowedValuesTipDate, trigger: 'hover' })
                 .setContent({ '.tooltip-inner': window.Messages.strMysqlAllowedValuesTipDate });
         }
     });
@@ -1521,7 +1521,7 @@ export function dismissNotifications () {
             displayCopyStatus(this, copyStatus);
         });
 
-        $(document).on('mouseover mouseleave', '.ajax_notification a', function (event) {
+        $(document).on('mouseover mouseleave', 'span.ajax_notification.dismissable a', function (event) {
             let message = window.Messages.strDismiss;
 
             if (event.type === 'mouseover') {
diff --git a/resources/js/table/select.ts b/resources/js/table/select.ts
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import * as bootstrap from 'bootstrap';
 import { AJAX } from '../modules/ajax.ts';
 import { addDatepicker, prepareForAjaxRequest } from '../modules/functions.ts';
 import { CommonParams } from '../modules/common.ts';
@@ -118,6 +119,14 @@ AJAX.registerOnload('table/select.js', function () {
         var $searchForm = $(this);
         event.preventDefault();
 
+        // Dispose tooltips. See #19950
+        $('input.datefield, input.timefield').each(function () {
+            const tooltipInstance = bootstrap.Tooltip.getInstance(this);
+            if (tooltipInstance) {
+                tooltipInstance.dispose();
+            }
+        });
+
         // empty previous search results while we are waiting for new results
         $('#sqlqueryresultsouter').empty();
         var $msgbox = ajaxShowMessage(window.Messages.strSearching, false);
