diff options
| author | Mark Otto <[email protected]> | 2018-04-29 22:22:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2018-04-29 22:22:04 -0700 |
| commit | 496311bf97deae799b7a1101893db135f3ce7ec7 (patch) | |
| tree | 64f3d90819f7a7bfcbc2ec1979a94b4cedc1f66f /js/dist/tooltip.js | |
| parent | 139e89235f7c768d42ac1148b75a9f8e45ead917 (diff) | |
| download | bootstrap-496311bf97deae799b7a1101893db135f3ce7ec7.tar.xz bootstrap-496311bf97deae799b7a1101893db135f3ce7ec7.zip | |
dist
Diffstat (limited to 'js/dist/tooltip.js')
| -rw-r--r-- | js/dist/tooltip.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/dist/tooltip.js b/js/dist/tooltip.js index 67426d8ad..1ddecb785 100644 --- a/js/dist/tooltip.js +++ b/js/dist/tooltip.js @@ -524,7 +524,7 @@ var Tooltip = function ($) { }; _proto._getConfig = function _getConfig(config) { - config = _objectSpread({}, this.constructor.Default, $(this.element).data(), config); + config = _objectSpread({}, this.constructor.Default, $(this.element).data(), typeof config === 'object' && config ? config : {}); if (typeof config.delay === 'number') { config.delay = { |