Skip to content

Commit 2cafb9f

Browse files
vsn4ikJohann-S
authored andcommitted
Simplify spread (#24774)
1 parent c81ce9f commit 2cafb9f

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

js/src/popover.js

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,18 @@ const Popover = (($) => {
2828

2929
const Default = {
3030
...Tooltip.Default,
31-
...{
32-
placement : 'right',
33-
trigger : 'click',
34-
content : '',
35-
template : '<div class="popover" role="tooltip">'
36-
+ '<div class="arrow"></div>'
37-
+ '<h3 class="popover-header"></h3>'
38-
+ '<div class="popover-body"></div></div>'
39-
}
31+
placement : 'right',
32+
trigger : 'click',
33+
content : '',
34+
template : '<div class="popover" role="tooltip">'
35+
+ '<div class="arrow"></div>'
36+
+ '<h3 class="popover-header"></h3>'
37+
+ '<div class="popover-body"></div></div>'
4038
}
4139

4240
const DefaultType = {
4341
...Tooltip.DefaultType,
44-
...{
45-
content : '(string|element|function)'
46-
}
42+
content : '(string|element|function)'
4743
}
4844

4945
const ClassName = {

js/src/tooltip.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,8 @@ const Tooltip = (($) => {
503503
if (this.config.selector) {
504504
this.config = {
505505
...this.config,
506-
...{
507-
trigger : 'manual',
508-
selector : ''
509-
}
506+
trigger : 'manual',
507+
selector : ''
510508
}
511509
} else {
512510
this._fixTitle()

0 commit comments

Comments
 (0)