Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow nested structure for accordions #25121

Merged
merged 8 commits into from
Dec 31, 2017
Merged

Allow nested structure for accordions #25121

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d3a2716
Allow nested structure for accordions
MartijnCuppens Dec 29, 2017
ab2e9ac
Merge branch 'v4-dev' into collapse-fix-parent
XhmikosR Dec 30, 2017
61473bf
Allow nested structure for accordions
MartijnCuppens Dec 30, 2017
7135c15
Merge branch 'collapse-fix-parent' of github.com:MartijnCuppens/boots…
MartijnCuppens Dec 30, 2017
e2b9c9b
Merge branch 'v4-dev' into collapse-fix-parent
MartijnCuppens Dec 30, 2017
ecca674
Add unit test for nested elements
MartijnCuppens Dec 30, 2017
61b9e5f
Update collapse.md
XhmikosR Dec 31, 2017
9f7c404
Merge branch 'v4-dev' into collapse-fix-parent
XhmikosR Dec 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion js/src/collapse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ const Collapse = (($) => {
let activesData

if (this._parent) {
actives = $.makeArray($(this._parent).children().children(Selector.ACTIVES))
actives = $.makeArray(
$(this._parent)
.find(Selector.ACTIVES)
.filter(`[data-parent="${this._config.parent}"]`)
)
if (!actives.length) {
actives = null
}
Expand Down