aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2019-08-14 18:02:41 +0200
committerXhmikosR <[email protected]>2019-08-18 17:19:36 +0300
commita9c35b3ca8492b38a7876eaee033398d35d9dabf (patch)
tree0bf9f79aa253ecb9d843f2b17ab181f61b6bf9d0 /js
parent9cee3c280803471dbd240e755279fe1e2c04ac9e (diff)
downloadbootstrap-a9c35b3ca8492b38a7876eaee033398d35d9dabf.tar.xz
bootstrap-a9c35b3ca8492b38a7876eaee033398d35d9dabf.zip
Remove useless check for null object with spread operator
Diffstat (limited to 'js')
-rw-r--r--js/src/dropdown/dropdown.js12
-rw-r--r--js/src/tooltip/tooltip.js11
2 files changed, 7 insertions, 16 deletions
diff --git a/js/src/dropdown/dropdown.js b/js/src/dropdown/dropdown.js
index 26bcf2aa3..fbf782a0e 100644
--- a/js/src/dropdown/dropdown.js
+++ b/js/src/dropdown/dropdown.js
@@ -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
diff --git a/js/src/tooltip/tooltip.js b/js/src/tooltip/tooltip.js
index 8bf998468..99ac29af6 100644
--- a/js/src/tooltip/tooltip.js
+++ b/js/src/tooltip/tooltip.js
@@ -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) {