diff options
Diffstat (limited to 'assets/javascripts/bootstrap/tooltip.js')
| -rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index 63f1bc6..22cd5cf 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -8,7 +8,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.0): tooltip.js + * Bootstrap (v4.1.1): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ var Tooltip = function ($) { * ------------------------------------------------------------------------ */ var NAME = 'tooltip'; - var VERSION = '4.1.0'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.tooltip'; var EVENT_KEY = "." + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -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 = { |