Simplify spread (#24774)

This commit is contained in:
Vasilii Artemchuk 2017-11-15 11:44:17 +03:00 committed by Johann-S
parent c81ce9fdf4
commit 2cafb9f127
2 changed files with 10 additions and 16 deletions

View File

@ -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 = {

View File

@ -503,10 +503,8 @@ const Tooltip = (($) => {
if (this.config.selector) {
this.config = {
...this.config,
...{
trigger : 'manual',
selector : ''
}
trigger : 'manual',
selector : ''
}
} else {
this._fixTitle()