From a9c35b3ca8492b38a7876eaee033398d35d9dabf Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Wed, 14 Aug 2019 18:02:41 +0200
Subject: Remove useless check for null object with spread operator

---
 js/src/dropdown/dropdown.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'js/src/dropdown')

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
-- 
cgit v1.2.3