Merge pull request #24 from mendix/fix/timeout

Fixing timeout to find elements

Author: diego-antonelli

package.json

@@ -1,6 +1,6 @@
 {
   "name": "BootstrapTooltip",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "This widget adds a tooltip to an user defined field, containing for example help text or extra information.",
   "license": "Apache-2.0",
   "author": "Mendix Technology B.V.",

src/BootstrapTooltip.js

@@ -46,7 +46,12 @@ export default declare("BootstrapTooltip.widget.BootstrapTooltip", [_WidgetBase,
         // Find element by classname in the same container (DOM level) as widget
         var $targetElement = $(this.domNode).siblings("." + this.tooltipClassName);
 
-        // No element found on same level, try to find target element on page
+        // No element found on same level, try to find target element on same parent
+        if ($targetElement.length === 0) {
+            $targetElement = $(this.domNode.parentNode).find("." + this.tooltipClassName);
+        }
+
+        // No element found on same level, try to find target element on same page
         if ($targetElement.length === 0) {
             $targetElement = $("." + this.tooltipClassName);
         }

src/BootstrapTooltipContext.js

@@ -14,7 +14,7 @@ export default declare("BootstrapTooltip.widget.BootstrapTooltipContext", [_boot
             var guid = obj ? obj.getGuid() : null;
             this._execMf(this.tooltipMessageMicroflow, guid, message => {
                 this._tooltipText = message;
-                this._initializeTooltip(callback);
+                setTimeout(() => this._initializeTooltip(callback), 10);
             });
             return;
         }
@@ -27,7 +27,7 @@ export default declare("BootstrapTooltip.widget.BootstrapTooltipContext", [_boot
             }
         }
 
-        this._initializeTooltip(callback);
+        setTimeout(() => this._initializeTooltip(callback), 10);
     },
 
     _resetSubscriptions: function() {