From ca5ef810f5b6f7bdc285eb9da2fee4a1ce046a45 Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Thu, 10 Jun 2021 11:00:05 +0300
Subject: [PATCH] Use on private method to set content & cleanup template

---
 js/src/popover.js | 29 ++---------------------------
 js/src/tooltip.js | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/js/src/popover.js b/js/src/popover.js
index 87df36086ac1..15deaafe2315 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -6,7 +6,6 @@
  */
 
 import { defineJQueryPlugin } from './util/index'
-import SelectorEngine from './dom/selector-engine'
 import Tooltip from './tooltip'
 
 /**
@@ -85,35 +84,11 @@ class Popover extends Tooltip {
     return this.getTitle() || this._getContent()
   }
 
-  getTipElement() {
-    if (this.tip) {
-      return this.tip
-    }
-
-    this.tip = super.getTipElement()
-
-    if (!this.getTitle()) {
-      SelectorEngine.findOne(SELECTOR_TITLE, this.tip).remove()
-    }
-
-    if (!this._getContent()) {
-      SelectorEngine.findOne(SELECTOR_CONTENT, this.tip).remove()
-    }
-
-    return this.tip
-  }
-
   setContent() {
     const tip = this.getTipElement()
 
-    // we use append for html objects to maintain js events
-    this.setElementContent(SelectorEngine.findOne(SELECTOR_TITLE, tip), this.getTitle())
-    let content = this._getContent()
-    if (typeof content === 'function') {
-      content = content.call(this._element)
-    }
-
-    this.setElementContent(SelectorEngine.findOne(SELECTOR_CONTENT, tip), content)
+    this._sanitizeAndSetContent(tip, this.getTitle(), SELECTOR_TITLE)
+    this._sanitizeAndSetContent(tip, this._getContent(), SELECTOR_CONTENT)
   }
 
   // Private
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index fa364a1e6811..e09a53b5ceea 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -376,8 +376,18 @@ class Tooltip extends BaseComponent {
 
   setContent() {
     const tip = this.getTipElement()
-    this.setElementContent(SelectorEngine.findOne(SELECTOR_TOOLTIP_INNER, tip), this.getTitle())
-    tip.classList.remove(CLASS_NAME_FADE, CLASS_NAME_SHOW)
+    this._sanitizeAndSetContent(tip, this.getTitle(), SELECTOR_TOOLTIP_INNER)
+  }
+
+  _sanitizeAndSetContent(template, content, selector) {
+    const templateElement = SelectorEngine.findOne(selector, template)
+    if (!content) {
+      templateElement.remove()
+      return
+    }
+
+    // we use append for html objects to maintain js events
+    this.setElementContent(templateElement, content)
   }
 
   setElementContent(element, content) {