mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-07 22:26:57 +02:00
Remove useless check for null object with spread operator
This commit is contained in:
@@ -341,7 +341,7 @@ class Dropdown {
|
||||
}
|
||||
|
||||
_getPopperConfig() {
|
||||
let popperConfig = {
|
||||
const popperConfig = {
|
||||
placement: this._getPlacement(),
|
||||
modifiers: {
|
||||
offset: this._getOffset(),
|
||||
@@ -361,14 +361,10 @@ class Dropdown {
|
||||
}
|
||||
}
|
||||
|
||||
if (this._config.popperConfig) {
|
||||
popperConfig = {
|
||||
...popperConfig,
|
||||
...this._config.popperConfig
|
||||
}
|
||||
return {
|
||||
...popperConfig,
|
||||
...this._config.popperConfig
|
||||
}
|
||||
|
||||
return popperConfig
|
||||
}
|
||||
|
||||
// Static
|
||||
|
@@ -483,15 +483,10 @@ class Tooltip {
|
||||
onUpdate: data => this._handlePopperPlacementChange(data)
|
||||
}
|
||||
|
||||
let resultConfig = defaultBsConfig
|
||||
if (this.config.popperConfig) {
|
||||
resultConfig = {
|
||||
...defaultBsConfig,
|
||||
...this.config.popperConfig
|
||||
}
|
||||
return {
|
||||
...defaultBsConfig,
|
||||
...this.config.popperConfig
|
||||
}
|
||||
|
||||
return resultConfig
|
||||
}
|
||||
|
||||
_addAttachmentClass(attachment) {
|
||||
|
Reference in New Issue
Block a user