mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-15 10:05:40 +02:00
Code Issues Releases Wiki Activity

fix issue related to Object.keys and Dropdown issue

Browse Source
This commit is contained in:
Johann-S
2018-04-13 11:52:12 +02:00
parent c3caf7ee4e
commit ba10b63c9d
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/collapse.js
View File

@@ -331,7 +331,7 @@ const Collapse = (($) => {
const _config = {
...Default,
...$this.data(),
...typeof config === 'object' && config
...typeof config === 'object' && config ? config : {}
}
if (!data && _config.toggle && /show|hide/.test(config)) {

2
js/src/modal.js
View File

@@ -500,7 +500,7 @@ const Modal = (($) => {
const _config = {
...Default,
...$(this).data(),
...typeof config === 'object' && config
...typeof config === 'object' && config ? config : {}
}
if (!data) {

2
js/src/scrollspy.js
View File

@@ -165,7 +165,7 @@ const ScrollSpy = (($) => {
_getConfig(config) {
config = {
...Default,
...config
...typeof config === 'object' && config ? config : {}
}
if (typeof config.target !== 'string') {

2
js/src/tooltip.js
View File

@@ -611,7 +611,7 @@ const Tooltip = (($) => {
config = {
...this.constructor.Default,
...$(this.element).data(),
...config
...typeof config === 'object' && config ? config : {}
}
if (typeof config.delay === 'number') {