mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-28 06:20:15 +02:00
Code Issues Releases Wiki Activity

upgrade to v4 stable

Browse Source
This commit is contained in:
Johann-S
2018-03-05 15:40:23 +01:00
committed by XhmikosR
parent 7f08061eca
commit 9744886519
4 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/collapse.js
View File

@@ -142,7 +142,11 @@ class Collapse {
}
if (actives) {
activesData = Data.getData(actives[0], DATA_KEY)
const tempActiveData = actives.filter((elem) => {
const container = SelectorEngine.findOne(this._selector)
return !container.contains(elem)
})
activesData = tempActiveData[0] ? Data.getData(tempActiveData[0], DATA_KEY) : null
if (activesData && activesData._isTransitioning) {
return
}
@@ -154,7 +158,12 @@ class Collapse {
}
if (actives) {
actives.forEach((elemActive) => Collapse._collapseInterface(elemActive, 'hide'))
actives.forEach((elemActive) => {
const container = SelectorEngine.findOne(this._selector)
if (!container.contains(elemActive)) {
Collapse._collapseInterface(elemActive, 'hide')
}
})
if (!activesData) {
Data.setData(actives[0], DATA_KEY, null)
}