From 37f74c70702c4e90e12f062e63358cb64670eb01 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Wed, 5 Dec 2018 10:25:00 +0100 Subject: fix regression about using element for tooltip container option --- js/src/tooltip.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'js/src') diff --git a/js/src/tooltip.js b/js/src/tooltip.js index f428a79ebd..1c40dfed34 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -272,8 +272,7 @@ class Tooltip { const attachment = this._getAttachment(placement) this.addAttachmentClass(attachment) - const container = this.config.container === false ? document.body : $(document).find(this.config.container) - + const container = this._getContainer() $(tip).data(this.constructor.DATA_KEY, this) if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) { @@ -450,6 +449,18 @@ class Tooltip { // Private + _getContainer() { + if (this.config.container === false) { + return document.body + } + + if (Util.isElement(this.config.container)) { + return $(this.config.container) + } + + return $(document).find(this.config.container) + } + _getAttachment(placement) { return AttachmentMap[placement.toUpperCase()] } -- cgit v1.2.3