diff options
author | Johann-S <johann.servoire@gmail.com> | 2019-08-14 19:02:41 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@gmail.com> | 2019-08-18 17:19:36 +0300 |
commit | a9c35b3ca8492b38a7876eaee033398d35d9dabf (patch) | |
tree | 0bf9f79aa253ecb9d843f2b17ab181f61b6bf9d0 | |
parent | 9cee3c280803471dbd240e755279fe1e2c04ac9e (diff) |
Remove useless check for null object with spread operator
-rw-r--r-- | js/src/dropdown/dropdown.js | 12 | ||||
-rw-r--r-- | js/src/tooltip/tooltip.js | 11 |
2 files changed, 7 insertions, 16 deletions
diff --git a/js/src/dropdown/dropdown.js b/js/src/dropdown/dropdown.js index 26bcf2aa3a..fbf782a0e1 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 8bf998468c..99ac29af6f 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) { |