1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 16:44:17 +02:00

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,7 +28,6 @@ const Popover = (($) => {
const Default = { const Default = {
...Tooltip.Default, ...Tooltip.Default,
...{
placement : 'right', placement : 'right',
trigger : 'click', trigger : 'click',
content : '', content : '',
@@ -37,14 +36,11 @@ const Popover = (($) => {
+ '<h3 class="popover-header"></h3>' + '<h3 class="popover-header"></h3>'
+ '<div class="popover-body"></div></div>' + '<div class="popover-body"></div></div>'
} }
}
const DefaultType = { const DefaultType = {
...Tooltip.DefaultType, ...Tooltip.DefaultType,
...{
content : '(string|element|function)' content : '(string|element|function)'
} }
}
const ClassName = { const ClassName = {
FADE : 'fade', FADE : 'fade',

View File

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