1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-10 15:44:51 +02:00
This commit is contained in:
Mark Otto
2018-04-29 22:22:04 -07:00
parent 139e89235f
commit 496311bf97
31 changed files with 144 additions and 98 deletions

2
js/dist/tooltip.js vendored
View File

@@ -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 = {