refactor(hxTooltip): refactor behavior for compatibility audit

HelixDesignSystem · Jan 9, 2019 · faad721 · faad721
1 parent 94e084d
commit faad721
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/helix-ui/elements/HXTooltipElement.js b/src/helix-ui/elements/HXTooltipElement.js
@@ -75,7 +75,6 @@ export class HXTooltipElement extends _ProtoClass {
 
         switch (attr) {
             case 'for':
-                // FIXME: only run if connected to DOM
                 this._connectToControl();
                 break;
 
@@ -94,12 +93,8 @@ export class HXTooltipElement extends _ProtoClass {
      * @returns {HTMLElement|undefined}
      */
     get controlElement () {
-        let rootNode = this.getRootNode();
-
-        // FIXME: use `if (this.isConnected) { ... }`
-        if (rootNode !== this) {
-            // FIXME: replace getElementById() with querySelector()
-            return rootNode.getElementById(this.htmlFor);
+        if (this.isConnected) {
+            return this.getRootNode().querySelector(`#${this.htmlFor}`);
         }
     }
 
@@ -132,7 +127,6 @@ export class HXTooltipElement extends _ProtoClass {
             return false;
         }
 
-        // FIXME: getRootNode() will not return document context before connect
         return (this.getRootNode().activeElement === ctrl);
     }