rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Code Issues Actions Packages Releases Activity

Add parentheses around multiple spread conditions

Browse Source
This commit is contained in:
XhmikosR 2020-06-26 18:50:04 +03:00
parent a67231ae1c
commit 6d86b140f9
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/collapse.js
View File

@ -342,7 +342,7 @@ class Collapse {
const _config = { const _config = {
...Default, ...Default,
...Manipulator.getDataAttributes(element), ...Manipulator.getDataAttributes(element),
...typeof config === 'object' && config ? config : {} ...(typeof config === 'object' && config ? config : {})
} }
if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) { if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {

2
js/src/dropdown.js
View File

@ -303,7 +303,7 @@ class Dropdown {
offset.fn = data => { offset.fn = data => {
data.offsets = { data.offsets = {
...data.offsets, ...data.offsets,
...this._config.offset(data.offsets, this._element) || {} ...(this._config.offset(data.offsets, this._element) || {})
} }
return data return data

2
js/src/modal.js
View File

@ -544,7 +544,7 @@ class Modal {
const _config = { const _config = {
...Default, ...Default,
...Manipulator.getDataAttributes(this), ...Manipulator.getDataAttributes(this),
...typeof config === 'object' && config ? config : {} ...(typeof config === 'object' && config ? config : {})
} }
if (!data) { if (!data) {

2
js/src/scrollspy.js
View File

@ -160,7 +160,7 @@ class ScrollSpy {
_getConfig(config) { _getConfig(config) {
config = { config = {
...Default, ...Default,
...typeof config === 'object' && config ? config : {} ...(typeof config === 'object' && config ? config : {})
} }
if (typeof config.target !== 'string' && isElement(config.target)) { if (typeof config.target !== 'string' && isElement(config.target)) {

2
js/src/toast.js
View File

@ -170,7 +170,7 @@ class Toast {
config = { config = {
...Default, ...Default,
...Manipulator.getDataAttributes(this._element), ...Manipulator.getDataAttributes(this._element),
...typeof config === 'object' && config ? config : {} ...(typeof config === 'object' && config ? config : {})
} }
typeCheckConfig(NAME, config, this.constructor.DefaultType) typeCheckConfig(NAME, config, this.constructor.DefaultType)

4
js/src/tooltip.js
View File

@ -491,7 +491,7 @@ class Tooltip {
offset.fn = data => { offset.fn = data => {
data.offsets = { data.offsets = {
...data.offsets, ...data.offsets,
...this.config.offset(data.offsets, this.element) || {} ...(this.config.offset(data.offsets, this.element) || {})
} }
return data return data
@ -689,7 +689,7 @@ class Tooltip {
config = { config = {
...this.constructor.Default, ...this.constructor.Default,
...dataAttributes, ...dataAttributes,
...typeof config === 'object' && config ? config : {} ...(typeof config === 'object' && config ? config : {})
} }
if (typeof config.delay === 'number') { if (typeof config.delay === 'number') {