Simplify spread (#24774)

twbs · Nov 15, 2017 · 2cafb9f · 2cafb9f
1 parent c81ce9f
commit 2cafb9f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/js/src/popover.js b/js/src/popover.js
@@ -28,22 +28,18 @@ const Popover = (($) => {
 
   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>'
-    }
+    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)'
-    }
+    content : '(string|element|function)'
   }
 
   const ClassName = {

diff --git a/js/src/tooltip.js b/js/src/tooltip.js
@@ -503,10 +503,8 @@ const Tooltip = (($) => {
       if (this.config.selector) {
         this.config = {
           ...this.config,
-          ...{
-            trigger  : 'manual',
-            selector : ''
-          }
+          trigger  : 'manual',
+          selector : ''
         }
       } else {
         this._fixTitle()