Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
099486f2
Commit
099486f2
authored
8 years ago
by
Johann-S
Browse files
Options
Download
Email Patches
Plain Diff
Detach accordions from .card
parent
95f37e4c
9 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!22391
V4 dev
,
!22598
test
,
!22138
Detach accordion from card
,
!25326
Adjust examples
,
!23995
Add back cursor: pointer for .btn-link
,
!23178
Spinner
,
!17021
v4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
js/src/collapse.js
+11
-2
js/src/collapse.js
with
11 additions
and
2 deletions
+11
-2
js/src/collapse.js
+
11
-
2
View file @
099486f2
...
...
@@ -57,7 +57,8 @@ const Collapse = (($) => {
const
Selector
=
{
ACTIVES
:
'
.card > .show, .card > .collapsing
'
,
DATA_TOGGLE
:
'
[data-toggle="collapse"]
'
DATA_TOGGLE
:
'
[data-toggle="collapse"]
'
,
DATA_CHILDREN
:
'
data-children
'
}
...
...
@@ -84,6 +85,14 @@ const Collapse = (($) => {
this
.
_addAriaAndCollapsedClass
(
this
.
_element
,
this
.
_triggerArray
)
}
this
.
_selectorActives
=
Selector
.
ACTIVES
if
(
this
.
_parent
)
{
const
childrenSelector
=
this
.
_parent
.
hasAttribute
(
Selector
.
DATA_CHILDREN
)
?
this
.
_parent
.
getAttribute
(
Selector
.
DATA_CHILDREN
)
:
null
if
(
childrenSelector
!==
null
)
{
this
.
_selectorActives
=
childrenSelector
+
'
> .show,
'
+
childrenSelector
+
'
> .collapsing
'
}
}
if
(
this
.
_config
.
toggle
)
{
this
.
toggle
()
}
...
...
@@ -124,7 +133,7 @@ const Collapse = (($) => {
let
activesData
if
(
this
.
_parent
)
{
actives
=
$
.
makeArray
(
$
(
this
.
_parent
).
find
(
Selector
.
ACTIVES
))
actives
=
$
.
makeArray
(
$
(
this
.
_parent
).
find
(
this
.
_selectorActives
))
if
(
!
actives
.
length
)
{
actives
=
null
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets