diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2018-04-30 19:24:29 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2018-04-30 19:24:29 +0300 |
commit | dee70cd0e7cbb8a2c327097030db76b2904c54c6 (patch) | |
tree | 7527dc7c08e93ff88386f7e988b53884005bdfdf /assets/javascripts/bootstrap/collapse.js | |
parent | d2ab4619a70c79f5cb9ffdfac2a321c01192e8c7 (diff) |
rake update[v4.1.1]
Diffstat (limited to 'assets/javascripts/bootstrap/collapse.js')
-rw-r--r-- | assets/javascripts/bootstrap/collapse.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js index 6b0c1da..9206bc4 100644 --- a/assets/javascripts/bootstrap/collapse.js +++ b/assets/javascripts/bootstrap/collapse.js @@ -8,7 +8,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.1.0): collapse.js + * Bootstrap (v4.1.1): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ var Collapse = function ($) { * ------------------------------------------------------------------------ */ var NAME = 'collapse'; - var VERSION = '4.1.0'; + var VERSION = '4.1.1'; var DATA_KEY = 'bs.collapse'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -290,7 +290,7 @@ var Collapse = function ($) { var $this = $(this); var data = $this.data(DATA_KEY); - var _config = _objectSpread({}, Default, $this.data(), typeof config === 'object' && config); + var _config = _objectSpread({}, Default, $this.data(), typeof config === 'object' && config ? config : {}); if (!data && _config.toggle && /show|hide/.test(config)) { _config.toggle = false; |