aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2012-11-05 19:05:58 +0100
committerScott González <scott.gonzalez@gmail.com>2012-11-13 10:46:00 -0500
commitfbc0e6afe6cb277f7e8b91817484cdcd002afc32 (patch)
treedd15b7fc7c0387d568f5515e98c86a4c7ce2bdbc
parent241c10044d8dadf186a8c29113a954580a44dec8 (diff)
downloadjquery-ui-fbc0e6afe6cb277f7e8b91817484cdcd002afc32.tar.gz
jquery-ui-fbc0e6afe6cb277f7e8b91817484cdcd002afc32.zip
Tooltip: Make 'flipfit flip' the collision default to avoid the tooltip ever overlapping the trigger. Also fix max-width for custom-content demo. Fixes #8739 - Tooltip: Default positioning on large items off.
(cherry picked from commit 1d9eab1ead0d5a6f60e31437bb539eb3f804bacc)
-rw-r--r--demos/tooltip/custom-content.html3
-rw-r--r--ui/jquery.ui.tooltip.js2
2 files changed, 4 insertions, 1 deletions
diff --git a/demos/tooltip/custom-content.html b/demos/tooltip/custom-content.html
index 93172524a..20039e2b8 100644
--- a/demos/tooltip/custom-content.html
+++ b/demos/tooltip/custom-content.html
@@ -22,6 +22,9 @@
width: 350px;
height: 350px;
}
+ .ui-tooltip {
+ max-width: 350px;
+ }
</style>
<script>
$(function() {
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 482ce2120..34c9b1a1a 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -54,7 +54,7 @@ $.widget( "ui.tooltip", {
position: {
my: "left top+15",
at: "left bottom",
- collision: "flipfit flipfit"
+ collision: "flipfit flip"
},
show: true,
tooltipClass: null,