Commit 6d86b140 authored by XhmikosR's avatar XhmikosR
Browse files

Add parentheses around multiple spread conditions

parent a67231ae
Showing with 7 additions and 7 deletions
+7 -7
...@@ -342,7 +342,7 @@ class Collapse { ...@@ -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)) {
......
...@@ -303,7 +303,7 @@ class Dropdown { ...@@ -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
......
...@@ -544,7 +544,7 @@ class Modal { ...@@ -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) {
......
...@@ -160,7 +160,7 @@ class ScrollSpy { ...@@ -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)) {
......
...@@ -170,7 +170,7 @@ class Toast { ...@@ -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)
......
...@@ -491,7 +491,7 @@ class Tooltip { ...@@ -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 { ...@@ -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') {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment