Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
aa479892
Commit
aa479892
authored
9 years ago
by
F A T
Browse files
Options
Download
Plain Diff
Merge pull request #16152 from jarthod/tooltip-placement-viewport-fix
Tooltip/popover: Fix auto placement to use viewport
parents
cc8567d7
5921724d
main
cleanup-floating-forms
cssvar-function
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
extend-snippets
feat/data-target
floating-always-visible
floating-labels-icons
fod-main-banner
form-controls-with-icons
github/fork/719media/patch-13
github/fork/719media/patch-14
github/fork/719media/patch-9
github/fork/ChellyAhmed/fix-typo-reboot.md
github/fork/ChellyAhmed/offcanvas-scroll-back
github/fork/CtrlAltLilith/main
github/fork/Elysiome/offcanvas-optional-window-resizing
github/fork/JanSargsyan/main
github/fork/LunicLynx/support-different-line-height-for-buttons
github/fork/Psixodelik/main
github/fork/Ronid1/ronid1/offcanvas_static_backdrop
github/fork/RyanBerliner/tooltip-accessibility
github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item
github/fork/Sir-Genius/utils
github/fork/Sumit-Singh-8/main
github/fork/Viktor-VERA2020/offcanvas-slide
github/fork/Zivangu9/input-group-for-form-control-plaintext
github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation
github/fork/astagi/fix/tree-shake-modules
github/fork/compnerd/dark-accordion-icon
github/fork/derSascha/dropdown-dont-close-on-input-click
github/fork/dev-ph1l/main
github/fork/donquixote/issue-33861-utl-mixin
github/fork/florianlacreuse/mixin-make-row-gutter-y
github/fork/gregorw/main
github/fork/iteggmbh/transitionend-dispose-race
github/fork/jdelStrother/patch-1
github/fork/jonnysp/form-floating
github/fork/jonnysp/independent-offcanvas
github/fork/jonnysp/theme-dark-on-card-and-modal-fix
github/fork/josefdlange/floating-label-placeholder-opacity
github/fork/julien-deramond/enhance-change-version.js
github/fork/julien-deramond/main-jd-fix-offset-content
github/fork/julien-deramond/main-jd-issue-with-utitlies
github/fork/julien-deramond/main-xmr-pa11y-ci-jd-add-hideElements
github/fork/kyletsang/fix-tooltip-padding
github/fork/lacutah/CheckboxCenteringDocumentation
github/fork/lekoala/patch-3
github/fork/louismaximepiton/main-kld-lmp-collapse-proposal
github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix
github/fork/louismaximepiton/main-lmp-carousel-multiple-images
github/fork/louismaximepiton/main-lmp-css-var-init
github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix
github/fork/louismaximepiton/main-lmp-input-range-fix
github/fork/louismaximepiton/main-lmp-shift-color
github/fork/louismaximepiton/main-lmp-table-active-tr-fix
github/fork/maciek-szn/switch
github/fork/michael-roth/feature/19964-multiple-tab-targets
github/fork/mistic100/dom-utils
github/fork/nkdas91/accordion
github/fork/nstungcom/fix-missing-modal-open-class
github/fork/oraliahdz/animation-utilities
github/fork/pine3ree/patch-7
github/fork/pouwerkerk/unindent-scss-docs-shortcode
github/fork/smares/smares-no-scolling-on-modal-close
github/fork/tgm-git/patch-1
gs-forms
gs-toasts-with-animated-progress-bar
gs/add-history-helper
gs/change-version-dir-on-docs
gs/data-must-set-onlu-one-instance
gs/docs/fix-drop-down-error
gs/event-handler-2
gs/make-docs-js-build
gs/make-simple-attribute-toggler
gs/popover-fix-doc
gs/provide-steConfig-method
gs/scrollspy-smoothscroll-option-use-browser-history
gs/streamline-jqueryInterface
gs/support-drop-down-in-navbar
gs/test-js-generic-trigger
gs/try-web-components
gs/tweak-collapse-js-selector
gs/use-event-handler-in-cocmponent
gs/use-rollup-replace-for-version
jo-docs-thanks-page
jo-ssr-friendly
logical-props-spacing-utils
main-fod-disabled-form-check-label
main-fod-nested-accordion
main-fod-simpler-table-structure
main-fod-table-separator
main-fod-utilities-contrast
main-jd-abbr-title
main-jd-add-chips
main-jd-add-doc-for-sass-custom-colors
main-jd-add-enable-host-to-handle-web-components
main-jd-browserstack-fine-tune
main-jd-browserstack-updates
main-jd-docs-consistent-usage-of-css-sections-step-2
main-jd-fix-docs-headers-in-white
main-jd-fix-highlight-docs-border-radius
main-jd-fix-placeholder-color-background-params-for-img-markup
main-jd-glossary-experiment
main-jd-postcss-drop-empty-css-vars
main-jd-proto-doc-astro
main-jd-skip-navigation-component
main-jd-stackblitz-for-examples
main-jd-upgrade-browserlistrc
main-jd-use-host
main-lmp-dark-theme-customization
main-lmp-handle-scroll-target
main-lmp-tab-fix
main-mc-opensearch
main-xmr-bundlewatch-action
main-xmr-eslint-plugin-compat
main-xmr-hugo-docs-vendor
main-xmr-hugo-rm-ver
main-xmr-linkinator-prod
main-xmr-min-mangle
main-xmr-pa11y-ci
more-darkmode-examples
nested-dropdowns
patrickhlauke-issue37428
patrickhlauke-use-of-color-tweaks
pr/34102
pr/37590
previous-next-docs-links
sticky-thead
utilities-functions-mixin
v3-dev
v4-dev
v4-dev-dropdown-hide-method
v530-dev
v6-postcss-custom-media
v6-spinner-dots
v6/gs/use-floating-ui-in-place-of-popper
xmr/dev
xmr/docs-png
xmr/docs-svgs
xmr/hugo-reorg-files
xmr/js-2
xmr/markdownlint
xmr/prepare-530-alpha2
xmr/xo
v5.3.0-alpha1
v5.2.3
v5.2.2
v5.2.1
v5.2.0
v5.2.0-beta1
v5.1.3
v5.1.2
v5.1.1
v5.1.0
v5.0.2
v5.0.1
v5.0.0
v5.0.0-beta3
v5.0.0-beta2
v5.0.0-beta1
v5.0.0-alpha3
v5.0.0-alpha2
v5.0.0-alpha1
v4.6.2
v4.6.1
v4.6.0
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.1
v4.4.0
v4.3.1
v4.3.0
v4.2.1
v4.2.0
v4.1.3
v4.1.2
v4.1.1
v4.1.0
v4.0.0
v4.0.0-beta.3
v4.0.0-beta.2
v4.0.0-beta
v4.0.0-alpha.6
v4.0.0-alpha.5
v4.0.0-alpha.4
v4.0.0-alpha.3
v4.0.0-alpha.2
v4.0.0-alpha
v3.4.1
v3.4.0
v3.3.7
v3.3.6
v3.3.5
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
+33
-12
js/tests/unit/tooltip.js
js/tooltip.js
+5
-6
js/tooltip.js
with
38 additions
and
18 deletions
+38
-18
js/tests/unit/tooltip.js
+
33
-
12
View file @
aa479892
...
@@ -376,23 +376,19 @@ $(function () {
...
@@ -376,23 +376,19 @@ $(function () {
assert
.
strictEqual
(
$
(
'
.tooltip
'
).
length
,
0
,
'
tooltip removed from dom
'
)
assert
.
strictEqual
(
$
(
'
.tooltip
'
).
length
,
0
,
'
tooltip removed from dom
'
)
})
})
QUnit
.
test
(
'
should be placed dynamically with the dynamic placement option
'
,
function
(
assert
)
{
QUnit
.
test
(
'
should be placed dynamically
to viewport
with the dynamic placement option
'
,
function
(
assert
)
{
assert
.
expect
(
6
)
assert
.
expect
(
6
)
var
$style
=
$
(
'
<style>
a
[rel="tooltip"] {
display: inline-block; position: absolute; } </style>
'
)
var
$style
=
$
(
'
<style>
div
[rel="tooltip"] {
position: absolute; } #qunit-fixture { top: inherit; left: inherit } </style>
'
).
appendTo
(
'
head
'
)
var
$container
=
$
(
'
<div/>
'
)
var
$container
=
$
(
'
<div/>
'
)
.
css
({
.
css
({
position
:
'
absolute
'
,
position
:
'
relative
'
,
overflow
:
'
hidden
'
,
height
:
'
100%
'
width
:
600
,
height
:
400
,
top
:
0
,
left
:
0
})
})
.
appendTo
(
document
.
body
)
.
appendTo
(
'
#qunit-fixture
'
)
var
$topTooltip
=
$
(
'
<div style="left: 0; top: 0;" rel="tooltip" title="Top tooltip">Top Dynamic Tooltip</div>
'
)
var
$topTooltip
=
$
(
'
<div style="left: 0; top: 0;" rel="tooltip" title="Top tooltip">Top Dynamic Tooltip</div>
'
)
.
appendTo
(
$container
)
.
appendTo
(
$container
)
.
bootstrapTooltip
({
placement
:
'
auto
'
})
.
bootstrapTooltip
({
placement
:
'
auto
'
,
viewport
:
'
#qunit-fixture
'
})
$topTooltip
.
bootstrapTooltip
(
'
show
'
)
$topTooltip
.
bootstrapTooltip
(
'
show
'
)
assert
.
ok
(
$
(
'
.tooltip
'
).
is
(
'
.bottom
'
),
'
top positioned tooltip is dynamically positioned to bottom
'
)
assert
.
ok
(
$
(
'
.tooltip
'
).
is
(
'
.bottom
'
),
'
top positioned tooltip is dynamically positioned to bottom
'
)
...
@@ -402,7 +398,7 @@ $(function () {
...
@@ -402,7 +398,7 @@ $(function () {
var
$rightTooltip
=
$
(
'
<div style="right: 0;" rel="tooltip" title="Right tooltip">Right Dynamic Tooltip</div>
'
)
var
$rightTooltip
=
$
(
'
<div style="right: 0;" rel="tooltip" title="Right tooltip">Right Dynamic Tooltip</div>
'
)
.
appendTo
(
$container
)
.
appendTo
(
$container
)
.
bootstrapTooltip
({
placement
:
'
right auto
'
})
.
bootstrapTooltip
({
placement
:
'
right auto
'
,
viewport
:
'
#qunit-fixture
'
})
$rightTooltip
.
bootstrapTooltip
(
'
show
'
)
$rightTooltip
.
bootstrapTooltip
(
'
show
'
)
assert
.
ok
(
$
(
'
.tooltip
'
).
is
(
'
.left
'
),
'
right positioned tooltip is dynamically positioned left
'
)
assert
.
ok
(
$
(
'
.tooltip
'
).
is
(
'
.left
'
),
'
right positioned tooltip is dynamically positioned left
'
)
...
@@ -412,7 +408,7 @@ $(function () {
...
@@ -412,7 +408,7 @@ $(function () {
var
$leftTooltip
=
$
(
'
<div style="left: 0;" rel="tooltip" title="Left tooltip">Left Dynamic Tooltip</div>
'
)
var
$leftTooltip
=
$
(
'
<div style="left: 0;" rel="tooltip" title="Left tooltip">Left Dynamic Tooltip</div>
'
)
.
appendTo
(
$container
)
.
appendTo
(
$container
)
.
bootstrapTooltip
({
placement
:
'
auto left
'
})
.
bootstrapTooltip
({
placement
:
'
auto left
'
,
viewport
:
'
#qunit-fixture
'
})
$leftTooltip
.
bootstrapTooltip
(
'
show
'
)
$leftTooltip
.
bootstrapTooltip
(
'
show
'
)
assert
.
ok
(
$
(
'
.tooltip
'
).
is
(
'
.right
'
),
'
left positioned tooltip is dynamically positioned right
'
)
assert
.
ok
(
$
(
'
.tooltip
'
).
is
(
'
.right
'
),
'
left positioned tooltip is dynamically positioned right
'
)
...
@@ -450,6 +446,31 @@ $(function () {
...
@@ -450,6 +446,31 @@ $(function () {
$styles
.
remove
()
$styles
.
remove
()
})
})
QUnit
.
test
(
'
should position tip on top if viewport has enough space and is not parent
'
,
function
(
assert
)
{
assert
.
expect
(
2
)
var
styles
=
'
<style>
'
+
'
#section { height: 300px; border: 1px solid red; margin-top: 100px; }
'
+
'
div[rel="tooltip"] { width: 150px; border: 1px solid blue; }
'
+
'
</style>
'
var
$styles
=
$
(
styles
).
appendTo
(
'
head
'
)
var
$container
=
$
(
'
<div id="section"/>
'
).
appendTo
(
'
#qunit-fixture
'
)
var
$target
=
$
(
'
<div rel="tooltip" title="tip"/>
'
)
.
appendTo
(
$container
)
.
bootstrapTooltip
({
placement
:
'
auto top
'
,
viewport
:
'
#qunit-fixture
'
})
$target
.
bootstrapTooltip
(
'
show
'
)
assert
.
ok
(
$
(
'
.tooltip
'
).
is
(
'
.top
'
),
'
top positioned tooltip is dynamically positioned to top
'
)
$target
.
bootstrapTooltip
(
'
hide
'
)
assert
.
strictEqual
(
$
(
'
.tooltip
'
).
length
,
0
,
'
tooltip removed from dom
'
)
$styles
.
remove
()
})
QUnit
.
test
(
'
should position tip on bottom if the tip
\'
s dimension exceeds the viewport area and placement is "auto top"
'
,
function
(
assert
)
{
QUnit
.
test
(
'
should position tip on bottom if the tip
\'
s dimension exceeds the viewport area and placement is "auto top"
'
,
function
(
assert
)
{
assert
.
expect
(
2
)
assert
.
expect
(
2
)
var
styles
=
'
<style>
'
var
styles
=
'
<style>
'
...
...
This diff is collapsed.
Click to expand it.
js/tooltip.js
+
5
-
6
View file @
aa479892
...
@@ -193,13 +193,12 @@
...
@@ -193,13 +193,12 @@
if
(
autoPlace
)
{
if
(
autoPlace
)
{
var
orgPlacement
=
placement
var
orgPlacement
=
placement
var
$container
=
this
.
options
.
container
?
$
(
this
.
options
.
container
)
:
this
.
$element
.
parent
()
var
viewportDim
=
this
.
getPosition
(
this
.
$viewport
)
var
containerDim
=
this
.
getPosition
(
$container
)
placement
=
placement
==
'
bottom
'
&&
pos
.
bottom
+
actualHeight
>
container
Dim
.
bottom
?
'
top
'
:
placement
=
placement
==
'
bottom
'
&&
pos
.
bottom
+
actualHeight
>
viewport
Dim
.
bottom
?
'
top
'
:
placement
==
'
top
'
&&
pos
.
top
-
actualHeight
<
container
Dim
.
top
?
'
bottom
'
:
placement
==
'
top
'
&&
pos
.
top
-
actualHeight
<
viewport
Dim
.
top
?
'
bottom
'
:
placement
==
'
right
'
&&
pos
.
right
+
actualWidth
>
container
Dim
.
width
?
'
left
'
:
placement
==
'
right
'
&&
pos
.
right
+
actualWidth
>
viewport
Dim
.
width
?
'
left
'
:
placement
==
'
left
'
&&
pos
.
left
-
actualWidth
<
container
Dim
.
left
?
'
right
'
:
placement
==
'
left
'
&&
pos
.
left
-
actualWidth
<
viewport
Dim
.
left
?
'
right
'
:
placement
placement
$tip
$tip
...
...
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
Menu
Explore
Projects
Groups
Snippets