mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-21 18:54:30 +01:00
grunt
This commit is contained in:
parent
4c98507010
commit
d0f76e416c
14
dist/js/bootstrap.js
vendored
14
dist/js/bootstrap.js
vendored
@ -1391,16 +1391,18 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
|||||||
if (delta.left) offset.left += delta.left
|
if (delta.left) offset.left += delta.left
|
||||||
else offset.top += delta.top
|
else offset.top += delta.top
|
||||||
|
|
||||||
var arrowDelta = delta.left ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
|
var isVertical = /top|bottom/.test(placement)
|
||||||
var arrowPosition = delta.left ? 'left' : 'top'
|
var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
|
||||||
var arrowOffsetPosition = delta.left ? 'offsetWidth' : 'offsetHeight'
|
var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
|
||||||
|
|
||||||
$tip.offset(offset)
|
$tip.offset(offset)
|
||||||
this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], arrowPosition)
|
this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
|
||||||
}
|
}
|
||||||
|
|
||||||
Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
|
Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {
|
||||||
this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
|
this.arrow()
|
||||||
|
.css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
|
||||||
|
.css(isHorizontal ? 'top' : 'left', '')
|
||||||
}
|
}
|
||||||
|
|
||||||
Tooltip.prototype.setContent = function () {
|
Tooltip.prototype.setContent = function () {
|
||||||
|
2
dist/js/bootstrap.min.js
vendored
2
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/raw-files.min.js
vendored
2
docs/assets/js/raw-files.min.js
vendored
File diff suppressed because one or more lines are too long
14
docs/dist/js/bootstrap.js
vendored
14
docs/dist/js/bootstrap.js
vendored
@ -1391,16 +1391,18 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
|||||||
if (delta.left) offset.left += delta.left
|
if (delta.left) offset.left += delta.left
|
||||||
else offset.top += delta.top
|
else offset.top += delta.top
|
||||||
|
|
||||||
var arrowDelta = delta.left ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
|
var isVertical = /top|bottom/.test(placement)
|
||||||
var arrowPosition = delta.left ? 'left' : 'top'
|
var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
|
||||||
var arrowOffsetPosition = delta.left ? 'offsetWidth' : 'offsetHeight'
|
var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
|
||||||
|
|
||||||
$tip.offset(offset)
|
$tip.offset(offset)
|
||||||
this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], arrowPosition)
|
this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
|
||||||
}
|
}
|
||||||
|
|
||||||
Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
|
Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {
|
||||||
this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
|
this.arrow()
|
||||||
|
.css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
|
||||||
|
.css(isHorizontal ? 'top' : 'left', '')
|
||||||
}
|
}
|
||||||
|
|
||||||
Tooltip.prototype.setContent = function () {
|
Tooltip.prototype.setContent = function () {
|
||||||
|
2
docs/dist/js/bootstrap.min.js
vendored
2
docs/dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user