Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
4c985070
Commit
4c985070
authored
10 years ago
by
Peter West
Committed by
Heinrich Fenkart
10 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Correctly selects arrow placement for a tooltip
Fixes
#13696
. Fixes
#13696
. Fixes
#14197
. Closes #13718.
parent
0a4c39dc
4 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/tests/unit/tooltip.js
+31
-0
js/tests/unit/tooltip.js
js/tooltip.js
+8
-6
js/tooltip.js
with
39 additions
and
6 deletions
+39
-6
js/tests/unit/tooltip.js
+
31
-
0
View file @
4c985070
...
@@ -836,4 +836,35 @@ $(function () {
...
@@ -836,4 +836,35 @@ $(function () {
equal
(
currentUid
,
$
(
'
#tt-content
'
).
text
())
equal
(
currentUid
,
$
(
'
#tt-content
'
).
text
())
})
})
test
(
'
should position arrow correctly when tooltip is moved to not appear offscreen
'
,
function
()
{
stop
()
var
styles
=
'
<style>
'
+
'
.tooltip, .tooltip *, .tooltip *:before, .tooltip *:after { box-sizing: border-box; }
'
+
'
.tooltip { position: absolute; }
'
+
'
.tooltip-arrow { position: absolute; width: 0; height: 0; }
'
+
'
.tooltip .tooltip-inner { max-width: 200px; padding: 3px 8px; }
'
+
'
</style>
'
var
$styles
=
$
(
styles
).
appendTo
(
'
head
'
)
$
(
'
<a href="#" title="tooltip title" style="position: absolute; bottom: 0; right: 0;">Foobar</a>
'
)
.
appendTo
(
'
body
'
)
.
on
(
'
shown.bs.tooltip
'
,
function
()
{
var
arrowStyles
=
$
(
this
).
data
(
'
bs.tooltip
'
).
$tip
.
find
(
'
.tooltip-arrow
'
).
attr
(
'
style
'
)
ok
(
/left/i
.
test
(
arrowStyles
)
&&
!
/top/i
.
test
(
arrowStyles
),
'
arrow positioned correctly
'
)
$
(
this
).
bootstrapTooltip
(
'
hide
'
)
})
.
on
(
'
hidden.bs.tooltip
'
,
function
()
{
$styles
.
remove
()
$
(
this
).
remove
()
start
()
})
.
bootstrapTooltip
({
container
:
'
body
'
,
placement
:
'
top
'
,
trigger
:
'
manual
'
})
.
bootstrapTooltip
(
'
show
'
)
})
})
})
This diff is collapsed.
Click to expand it.
js/tooltip.js
+
8
-
6
View file @
4c985070
...
@@ -261,16 +261,18 @@
...
@@ -261,16 +261,18 @@
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
arrow
Position
=
delta
.
left
?
'
left
'
:
'
top
'
var
arrow
Delta
=
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
()
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment