diff options
| author | Johann-S <johann.servoire@gmail.com> | 2018-04-13 12:52:12 +0300 |
|---|---|---|
| committer | Johann-S <johann.servoire@gmail.com> | 2018-04-13 19:59:30 +0300 |
| commit | ba10b63c9da3c0fab5611e8001e490af527b8c7a (patch) | |
| tree | 1f2232242d0c22509c99e4e3c298e7b351cecf91 /js/src/tooltip.js | |
| parent | c3caf7ee4e1e6403169ec36e1b1bef36f894c16a (diff) | |
fix issue related to Object.keys and Dropdown issue
Diffstat (limited to 'js/src/tooltip.js')
| -rw-r--r-- | js/src/tooltip.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/src/tooltip.js b/js/src/tooltip.js index f751ee3c94..59c26897c9 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -611,7 +611,7 @@ const Tooltip = (($) => { config = { ...this.constructor.Default, ...$(this.element).data(), - ...config + ...typeof config === 'object' && config ? config : {} } if (typeof config.delay === 'number') { |