Node.js based forum software built for the modern web
fix: clean up active and orphaned tooltips on ajaxify transitions and chat modal actions (#14745)
palmoni53052ab0370bc
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.jsindex 3741329c37..3bcb69888e 100644--- a/public/src/ajaxify.js+++ b/public/src/ajaxify.js@@ -508,14 +508,30 @@ ajaxify.widgets = { render: render };});};+ ajaxify.destroyTooltips = () => {+ $('.tooltip').each(function () {+ const id = this.getAttribute('id');+ const trigger = id ? document.querySelector(`[aria-describedby="${id}"]`) : null;+ if (trigger && window.bootstrap && window.bootstrap.Tooltip) {+ const tooltip = window.bootstrap.Tooltip.getInstance(trigger);+ if (tooltip) {+ tooltip.hide();+ }+ }+ $(this).remove();+ });+ };+ajaxify.cleanup = (url, tpl_url) => {app.leaveCurrentRoom();$(window).off('scroll');+ ajaxify.destroyTooltips();hooks.fire('action:ajaxify.cleanup', { url, tpl_url });};ajaxify.handleTransientElements = () => {// todo: modals?+ ajaxify.destroyTooltips();const elements = ['[component="notifications"]', '[component="chat/dropdown"]', '[component="sidebar/drafts"]', '[component="header/avatar"]'].map(el => document.querySelector(`${el} .dropdown-menu.show`) || document.querySelector(`${el} + .dropdown-menu.show`))diff --git a/public/src/modules/chat.js b/public/src/modules/chat.jsindex e3c0491d52..40892c68e2 100644--- a/public/src/modules/chat.js+++ b/public/src/modules/chat.js@@ -525,6 +525,7 @@ define('chat', [Chat.close = function (uuid) {const chatModal = $('.chat-modal[data-uuid="' + uuid + '"]');+ chatModal.find('[data-bs-toggle="tooltip"]').tooltip('dispose');chatModal.remove();chatModal.data('modal', null);taskbar.discard('chat', uuid);@@ -622,6 +623,7 @@ define('chat', [Chat.minimize = function (uuid) {const chatModal = $('.chat-modal[data-uuid="' + uuid + '"]');+ chatModal.find('[data-bs-toggle="tooltip"]').tooltip('hide');chatModal.addClass('hide');taskbar.minimize('chat', uuid);hooks.fire('action:chat.minimized', {