From 2cafb9f127f1772d9831c2de4fe567b061303f0a Mon Sep 17 00:00:00 2001
From: Vasilii Artemchuk <vsn4ik@gmail.com>
Date: Wed, 15 Nov 2017 11:44:17 +0300
Subject: [PATCH] Simplify spread (#24774)
---
js/src/popover.js | 20 ++++++++------------
js/src/tooltip.js | 6 ++----
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/js/src/popover.js b/js/src/popover.js
index 8beec963a2..00a97a3f01 100644
--- 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
index 002dea4298..573997e7da 100644
--- 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()
--
GitLab