- fix tooltips

Osiris-Team · Aug 12, 2024 · a9f4b53 · a9f4b53
1 parent f6bd25c
commit a9f4b53
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/com/osiris/desku/ui/UI.java b/src/main/java/com/osiris/desku/ui/UI.java
@@ -148,6 +148,13 @@ public static void remove(Thread... threads) {
      */
     public abstract void plusY(int y) throws InterruptedException, InvocationTargetException;
 
+    /**
+     * @see #executeJavaScriptSafely(String, String, int)
+     */
+    public void executeJavaScriptSafely(String jsCode) {
+        executeJavaScriptSafely(jsCode, "internal", 0);
+    }
+
     /**
      * Executes {@link #executeJavaScript(String, String, int)} only once the UI is loaded and after
      * some internals JS dependencies are loaded.

diff --git a/src/main/java/com/osiris/desku/ui/layout/Tooltip.java b/src/main/java/com/osiris/desku/ui/layout/Tooltip.java
@@ -1,6 +1,7 @@
 package com.osiris.desku.ui.layout;
 
 import com.osiris.desku.ui.Component;
+import com.osiris.desku.ui.UI;
 
 public class Tooltip{
     public Component<?, ?> parent;
@@ -15,7 +16,8 @@ public Tooltip attachToParent(){
         parent.atr("data-bs-toggle", "tooltip");
         parent.atr("data-bs-title", content);
 
-        parent.executeJS("new bootstrap.Tooltip(comp)");
+        UI ui = UI.get();
+        ui.executeJavaScriptSafely(ui.jsGetComp("comp", parent.id) + "new bootstrap.Tooltip(comp)");
         return this;
     }
 }