Object spread : less jQuery more ES6 (#24665)

1 files changed, 19 insertions, 13 deletions

diff --git a/js/src/popover.js b/js/src/popover.js
index 5534f44412..8beec963a2 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -26,19 +26,25 @@ const Popover = (($) => {
   const CLASS_PREFIX        = 'bs-popover'
   const BSCLS_PREFIX_REGEX  = new RegExp(`(^|\\s)${CLASS_PREFIX}\\S+`, 'g')
 
-  const Default = $.extend({}, Tooltip.Default, {
-    placement : 'right',
-    trigger   : 'click',
-    content   : '',
-    template  : '<div class="popover" role="tooltip">'
-              + '<div class="arrow"></div>'
-              + '<h3 class="popover-header"></h3>'
-              + '<div class="popover-body"></div></div>'
-  })
-
-  const DefaultType = $.extend({}, Tooltip.DefaultType, {
-    content : '(string|element|function)'
-  })
+  const Default = {
+    ...Tooltip.Default,
+    ...{
+      placement : 'right',
+      trigger   : 'click',
+      content   : '',
+      template  : '<div class="popover" role="tooltip">'
+                + '<div class="arrow"></div>'
+                + '<h3 class="popover-header"></h3>'
+                + '<div class="popover-body"></div></div>'
+    }
+  }
+
+  const DefaultType = {
+    ...Tooltip.DefaultType,
+    ...{
+      content : '(string|element|function)'
+    }
+  }
 
   const ClassName = {
     FADE : 'fade',