Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann-S <johann.servoire@gmail.com>2017-11-13 13:25:36 +0300
committerGitHub <noreply@github.com>2017-11-13 13:25:36 +0300
commit9a0bba9afa039308e84442a2b329bf64f5678a00 (patch)
tree0b4216889b0b675407b85d74692d8505ecfd0c82 /js/src/scrollspy.js
parent1354a929f911bfb8bf3a9b22c0f79fc0277c3a74 (diff)
Object spread : less jQuery more ES6 (#24665)
Diffstat (limited to 'js/src/scrollspy.js')
-rw-r--r--js/src/scrollspy.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
index 3a13d954ac..fd5197e383 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')