rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

Simplify spread (#24774)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/src/popover.js
View File

@ -28,22 +28,18 @@ const Popover = (($) => {
const Default = { const Default = {
...Tooltip.Default, ...Tooltip.Default,
...{ placement : 'right',
placement : 'right', trigger : 'click',
trigger : 'click', content : '',
content : '', template : '<div class="popover" role="tooltip">'
template : '<div class="popover" role="tooltip">' + '<div class="arrow"></div>'
+ '<div class="arrow"></div>' + '<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 = {

6
js/src/tooltip.js
View File

@ -503,10 +503,8 @@ 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()