Skip to content
GitLab
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
6d86b140
Commit
6d86b140
authored
4 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Add parentheses around multiple spread conditions
parent
a67231ae
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
js/src/collapse.js
+1
-1
js/src/collapse.js
js/src/dropdown.js
+1
-1
js/src/dropdown.js
js/src/modal.js
+1
-1
js/src/modal.js
js/src/scrollspy.js
+1
-1
js/src/scrollspy.js
js/src/toast.js
+1
-1
js/src/toast.js
js/src/tooltip.js
+2
-2
js/src/tooltip.js
with
7 additions
and
7 deletions
+7
-7
js/src/collapse.js
+
1
-
1
View file @
6d86b140
...
...
@@ -342,7 +342,7 @@ class Collapse {
const
_config
=
{
...
Default
,
...
Manipulator
.
getDataAttributes
(
element
),
...
typeof
config
===
'
object
'
&&
config
?
config
:
{}
...
(
typeof
config
===
'
object
'
&&
config
?
config
:
{}
)
}
if
(
!
data
&&
_config
.
toggle
&&
typeof
config
===
'
string
'
&&
/show|hide/
.
test
(
config
))
{
...
...
This diff is collapsed.
Click to expand it.
js/src/dropdown.js
+
1
-
1
View file @
6d86b140
...
...
@@ -303,7 +303,7 @@ class Dropdown {
offset
.
fn
=
data
=>
{
data
.
offsets
=
{
...
data
.
offsets
,
...
this
.
_config
.
offset
(
data
.
offsets
,
this
.
_element
)
||
{}
...
(
this
.
_config
.
offset
(
data
.
offsets
,
this
.
_element
)
||
{}
)
}
return
data
...
...
This diff is collapsed.
Click to expand it.
js/src/modal.js
+
1
-
1
View file @
6d86b140
...
...
@@ -544,7 +544,7 @@ class Modal {
const
_config
=
{
...
Default
,
...
Manipulator
.
getDataAttributes
(
this
),
...
typeof
config
===
'
object
'
&&
config
?
config
:
{}
...
(
typeof
config
===
'
object
'
&&
config
?
config
:
{}
)
}
if
(
!
data
)
{
...
...
This diff is collapsed.
Click to expand it.
js/src/scrollspy.js
+
1
-
1
View file @
6d86b140
...
...
@@ -160,7 +160,7 @@ class ScrollSpy {
_getConfig
(
config
)
{
config
=
{
...
Default
,
...
typeof
config
===
'
object
'
&&
config
?
config
:
{}
...
(
typeof
config
===
'
object
'
&&
config
?
config
:
{}
)
}
if
(
typeof
config
.
target
!==
'
string
'
&&
isElement
(
config
.
target
))
{
...
...
This diff is collapsed.
Click to expand it.
js/src/toast.js
+
1
-
1
View file @
6d86b140
...
...
@@ -170,7 +170,7 @@ class Toast {
config
=
{
...
Default
,
...
Manipulator
.
getDataAttributes
(
this
.
_element
),
...
typeof
config
===
'
object
'
&&
config
?
config
:
{}
...
(
typeof
config
===
'
object
'
&&
config
?
config
:
{}
)
}
typeCheckConfig
(
NAME
,
config
,
this
.
constructor
.
DefaultType
)
...
...
This diff is collapsed.
Click to expand it.
js/src/tooltip.js
+
2
-
2
View file @
6d86b140
...
...
@@ -491,7 +491,7 @@ class Tooltip {
offset
.
fn
=
data
=>
{
data
.
offsets
=
{
...
data
.
offsets
,
...
this
.
config
.
offset
(
data
.
offsets
,
this
.
element
)
||
{}
...
(
this
.
config
.
offset
(
data
.
offsets
,
this
.
element
)
||
{}
)
}
return
data
...
...
@@ -689,7 +689,7 @@ class Tooltip {
config
=
{
...
this
.
constructor
.
Default
,
...
dataAttributes
,
...
typeof
config
===
'
object
'
&&
config
?
config
:
{}
...
(
typeof
config
===
'
object
'
&&
config
?
config
:
{}
)
}
if
(
typeof
config
.
delay
===
'
number
'
)
{
...
...
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