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
fa1504e6
Commit
fa1504e6
authored
8 years ago
by
Johann-S
Browse files
Options
Download
Email Patches
Plain Diff
Fix code style
parent
099486f2
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
+1
-2
js/src/collapse.js
with
1 addition
and
2 deletions
+1
-2
js/src/collapse.js
+
1
-
2
View file @
fa1504e6
...
...
@@ -78,7 +78,6 @@ const Collapse = (($) => {
`[data-toggle="collapse"][href="#
${
element
.
id
}
"],`
+
`[data-toggle="collapse"][data-target="#
${
element
.
id
}
"]`
))
this
.
_parent
=
this
.
_config
.
parent
?
this
.
_getParent
()
:
null
if
(
!
this
.
_config
.
parent
)
{
...
...
@@ -89,7 +88,7 @@ const Collapse = (($) => {
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
'
this
.
_selectorActives
=
`
${
childrenSelector
}
> .show,
${
childrenSelector
}
> .collapsing
`
}
}
...
...
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