Now possible to reregister tooltips for a specific container

janfaracik · Mar 28, 2022 · 32d790a · 32d790a
1 parent d5608a1
commit 32d790a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
@@ -23,4 +23,4 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<l:icon class="icon-lock icon-sm" tooltip="${%Keep this build forever}:&lt;br/&gt;${h.xmlEscape(build.whyKeepLog)}" xmlns:l="/lib/layout"/>
+<l:icon class="icon-lock icon-sm" tooltip="${%Keep this build forever}:\n${h.xmlEscape(build.whyKeepLog)}" xmlns:l="/lib/layout"/>
diff --git a/war/src/main/js/tooltips.js b/war/src/main/js/tooltips.js
@@ -30,23 +30,28 @@ registerTooltips()
 /**
  * Registers tooltips for the page
  * If called again, destroys existing tooltips and registers them again (useful for progressive rendering)
+ * @param {HTMLElement} container - Registers the tooltips for the given container
  */
-function registerTooltips() {
+function registerTooltips(container = document) {
   tooltipInstances.forEach(instance => {
-    instance.destroy()
+    if (instance.props.container === container) {
+      instance.destroy()
+    }
   })
 
-  tippy("[tooltip]:not([tooltip=\"\"])", {
+  tippy(container.querySelectorAll("[tooltip]:not([tooltip=\"\"])"), {
     content: element => element.getAttribute("tooltip")
       .replace("<br>", "\n")
       .replace("<br/>", "\n")
       .replace("\\n", "\n"),
+    container: container,
     ...TOOLTIP_BASE
   })
 
-  tippy("[html-tooltip]", {
+  tippy(container.querySelectorAll("[html-tooltip]"), {
     content: element => element.getAttribute("html-tooltip"),
     allowHTML: true,
+    container: container,
     ...TOOLTIP_BASE
   })
 }

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1736,6 +1736,7 @@ function refreshPart(id,url) {
 
                     Behaviour.applySubtree(node);
                     layoutUpdateCallback.call();
+                    registerTooltips(node)
                 }
             });
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1736,6 +1736,7 @@ function refreshPart(id,url) { @@
                         Behaviour.applySubtree(node);
                         layoutUpdateCallback.call();
+                        registerTooltips(node)
                     }
                 });
             }
@@ Expand Down @@