From 53c77c020368dbd570bd2d29ffc0c3660a0f6ab3 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Thu, 25 Nov 2021 20:33:42 +0200 Subject: [PATCH] Tooltip: refactor jQueryInterface --- js/src/popover.js | 14 ++++++++------ js/src/tooltip.js | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/js/src/popover.js b/js/src/popover.js index 19c1e42a4d..aea1b97020 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -94,13 +94,15 @@ class Popover extends Tooltip { return this.each(function () { const data = Popover.getOrCreateInstance(this, config) - if (typeof config === 'string') { - if (typeof data[config] === 'undefined') { - throw new TypeError(`No method named "${config}"`) - } - - data[config]() + if (typeof config !== 'string') { + return } + + if (typeof data[config] === 'undefined') { + throw new TypeError(`No method named "${config}"`) + } + + data[config]() }) } } diff --git a/js/src/tooltip.js b/js/src/tooltip.js index b09ab0d0ca..b0963a0021 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -637,13 +637,15 @@ class Tooltip extends BaseComponent { return this.each(function () { const data = Tooltip.getOrCreateInstance(this, config) - if (typeof config === 'string') { - if (typeof data[config] === 'undefined') { - throw new TypeError(`No method named "${config}"`) - } - - data[config]() + if (typeof config !== 'string') { + return } + + if (typeof data[config] === 'undefined') { + throw new TypeError(`No method named "${config}"`) + } + + data[config]() }) } }