From 9a0bba9afa039308e84442a2b329bf64f5678a00 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Mon, 13 Nov 2017 11:25:36 +0100
Subject: Object spread : less jQuery more ES6 (#24665)

---
 js/src/scrollspy.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'js/src/scrollspy.js')

diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
index 3a13d954a..fd5197e38 100644
--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -171,7 +171,10 @@ const ScrollSpy = (($) => {
     // private
 
     _getConfig(config) {
-      config = $.extend({}, Default, config)
+      config = {
+        ...Default,
+        ...config
+      }
 
       if (typeof config.target !== 'string') {
         let id = $(config.target).attr('id')
-- 
cgit v1.2.3