From cbc632da7d1fc6a7b6ba0bb8b80394d396774b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 5 Oct 2022 10:09:44 -0400 Subject: [PATCH] fix bs tooltips, update status tooltips see https://github.com/twbs/bootstrap/issues/32372 --- public/src/admin/dashboard.js | 4 +++- public/src/app.js | 16 ++++++++++++++-- public/src/client/categories.js | 1 + public/src/client/header.js | 1 + public/src/client/topic/threadTools.js | 1 + public/src/sockets.js | 1 + 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js index b378ea7fb9..d8bdd5386d 100644 --- a/public/src/admin/dashboard.js +++ b/public/src/admin/dashboard.js @@ -43,7 +43,9 @@ define('admin/dashboard', [ isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); - $('[data-bs-toggle="tooltip"]').tooltip(); + $('[data-bs-toggle="tooltip"]').tooltip({ + animation: false, + }); setupRealtimeButton(); setupGraphs(function () { diff --git a/public/src/app.js b/public/src/app.js index 48470b4313..a3356534bf 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -243,6 +243,7 @@ if (document.readyState === 'loading') { selector: '.avatar', placement: placement || 'top', container: '#content', + animation: false, }); } }; @@ -252,6 +253,18 @@ if (document.readyState === 'loading') { $('body').tooltip({ selector: '.fa-circle.status', placement: 'top', + container: '#content', + animation: false, + }); + + $('#content').on('inserted.bs.tooltip', function (ev) { + const target = $(ev.target); + if (target.attr('component') === 'user/status') { + const newTitle = target.attr('data-new-title'); + if (newTitle) { + $('.tooltip .tooltip-inner').text(newTitle); + } + } }); } }; @@ -296,8 +309,7 @@ if (document.readyState === 'loading') { translator.translate('[[global:' + status + ']]', function (translated) { el.removeClass('online offline dnd away') .addClass(status) - .attr('title', translated) - .attr('data-original-title', translated); + .attr('data-new-title', translated) }); }); }; diff --git a/public/src/client/categories.js b/public/src/client/categories.js index 831eb73172..e7929423d8 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -24,6 +24,7 @@ define('forum/categories', ['components', 'categorySelector', 'hooks'], function $('.category-header').tooltip({ placement: 'bottom', + animation: false, }); }; diff --git a/public/src/client/header.js b/public/src/client/header.js index 8eec3d6e66..0633946ee2 100644 --- a/public/src/client/header.js +++ b/public/src/client/header.js @@ -49,6 +49,7 @@ define('forum/header', [ placement: 'bottom', trigger: 'hover', container: 'body', + animation: false, }); } diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 28fcb10f4e..ac409779e5 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -19,6 +19,7 @@ define('forum/topic/threadTools', [ $('.topic-main-buttons [title]').tooltip({ container: '#content', + animation: false, }); // function topicCommand(method, path, command, onComplete) { diff --git a/public/src/sockets.js b/public/src/sockets.js index 6f4e66d936..6d3ccfbb80 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -199,6 +199,7 @@ app = window.app || {}; reconnectEl.addClass('active').removeClass('hide').tooltip({ placement: 'bottom', + animation: false, }); }