Skip to content

Commit 1a89b6e

Browse files
jzaeffererjzaefferer
committed
merge
2 parents 2958b0c + 9ec4c4e commit 1a89b6e

File tree

5 files changed

+149
-9
lines changed

5 files changed

+149
-9
lines changed

‎demos/tooltip/forms.html

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Tooltip - Default demo</title>
5+
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.4.2.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
10+
<script type="text/javascript" src="../../ui/jquery.ui.tooltip.js"></script>
11+
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
12+
<link type="text/css" href="../demos.css" rel="stylesheet" />
13+
<script type="text/javascript">
14+
$(function() {
15+
$("[title]").tooltip();
16+
$("<button/>").text("Show help").button().toggle(function() {
17+
$(":ui-tooltip").tooltip("open");
18+
}, function() {
19+
$(":ui-tooltip").tooltip("close");
20+
}).appendTo("form");
21+
});
22+
</script>
23+
<style>
24+
label { display: inline-block; width: 5em; }
25+
.ui-icon { display: inline-block; }
26+
fieldset div {
27+
margin-bottom: 2em;
28+
}
29+
.ui-tooltip { width: 200px; }
30+
</style>
31+
</head>
32+
<body>
33+
34+
<div class="demo">
35+
36+
<form>
37+
<fieldset>
38+
<div>
39+
<label for="firstname">Firstname</label>
40+
<input id="firstname" name="firstname" />
41+
<span title="Please provide your firstname." class="ui-state-default ui-corner-all ui-icon ui-icon-help">?</span>
42+
</div>
43+
<div>
44+
<label for="lastname">Lastname</label>
45+
<input id="lastname" name="lastname" />
46+
<span title="Please provide also your lastname." class="ui-state-default ui-corner-all ui-icon ui-icon-help">?</span>
47+
</div>
48+
<div>
49+
<label for="address">Address</label>
50+
<input id="address" name="address" />
51+
<span title="Your home or work address." class="ui-state-default ui-corner-all ui-icon ui-icon-help">?</span>
52+
</div>
53+
</fieldset>
54+
</form>
55+
56+
</div><!-- End demo -->
57+
58+
59+
60+
<div class="demo-description">
61+
62+
<p>Hover the questionmark-buttons or use the button below to display the help texts all at once. Click again to hide them.</p>
63+
64+
</div><!-- End demo-description -->
65+
66+
67+
68+
</body>
69+
</html>

‎demos/tooltip/tracking.html

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Tooltip - Default demo</title>
5+
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.4.2.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
10+
<script type="text/javascript" src="../../ui/jquery.ui.tooltip.js"></script>
11+
<link type="text/css" href="../demos.css" rel="stylesheet" />
12+
<script type="text/javascript">
13+
$(function() {
14+
$("a, input").tooltip({
15+
open: function() {
16+
var tooltip = $(this).tooltip("widget");
17+
$(document).mousemove(function(event) {
18+
tooltip.position({
19+
my: "left center",
20+
at: "right center",
21+
offset: "25 25",
22+
of: event
23+
});
24+
})
25+
// trigger once to override element-relative positioning
26+
.mousemove();
27+
},
28+
close: function() {
29+
$(document).unbind("mousemove");
30+
}
31+
});
32+
});
33+
</script>
34+
<style>
35+
label { display: inline-block; width: 5em; }
36+
</style>
37+
</head>
38+
<body>
39+
40+
<div class="demo">
41+
42+
<p><a href="#" title="That's what this widget is">Tooltips</a> can be attached to any element. When you hover
43+
the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.
44+
</p>
45+
<p>But as it's not a native tooltip, it can be styled. Any themes built with
46+
<a href="http://themeroller.com" title="ThemeRoller, jQuery UI's theme builder application">ThemeRoller</a>
47+
will also style tooltip's accordingly.</p>
48+
<p>Tooltip's are also useful for form elements, to show some additional information in the context of each field.</p>
49+
<p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes." /></p>
50+
<p>Click the field to see the tooltip; when you tab out of the field, it gets hidden.</p>
51+
52+
</div><!-- End demo -->
53+
54+
55+
56+
<div class="demo-description">
57+
58+
<p>Here the tooltips are positioned relative to the mouse, and follow the mouse while it moves above the element.</p>
59+
60+
</div><!-- End demo-description -->
61+
62+
63+
64+
</body>
65+
</html>

‎tests/visual/compound/widgets_in_dialog.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
<script type="text/javascript" src="../../../ui/jquery.ui.progressbar.js"></script>
2121
<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
2222
<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
23+
<script type="text/javascript" src="../../../ui/jquery.ui.tooltip.js"></script>
2324
<script type="text/javascript">
2425
$(function() {
26+
$("[title]").tooltip();
27+
2528
$("#accordion").accordion();
2629
$("#autocomplete").autocomplete({
2730
source: ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl"]
@@ -50,7 +53,7 @@
5053
width: 100,
5154
height: 75,
5255
modal: true
53-
})
56+
});
5457
});
5558
</script>
5659
</head>
@@ -76,11 +79,11 @@ <h3><a href="#">Accordion Header 3</a></h3>
7679
<input id="datepicker">
7780
<button>Another button</button>
7881
<div>
79-
<label for="progress">Progress: <input id="progress" /></label>
82+
<label for="progress">Progress: <input title="The progress we made so far" id="progress" /></label>
8083
</div>
8184
<div id="progressbar">
8285
</div>
83-
<div id="slider"></div>
86+
<div id="slider" title="Sliding progress..."></div>
8487
<div id="tabs">
8588
<ul>
8689
<li><a href="#tabs-1">First</a></li>

‎themes/base/jquery.ui.tooltip.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-webkit-box-shadow: 0 0 5px #aaa;
88
box-shadow: 0 0 5px #aaa;
99
}
10+
/* Fades and background-images don't work well together in IE6, drop the image */
1011
* html .ui-tooltip {
1112
background-image: none;
1213
}

‎ui/jquery.ui.tooltip.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $.widget("ui.tooltip", {
4949
this.opacity = this.tooltip.css("opacity");
5050
this.element
5151
.bind("focus.tooltip mouseenter.tooltip", function(event) {
52-
self.show($(event.target));
52+
self.open();
5353
})
5454
.bind("blur.tooltip mouseleave.tooltip", function(event) {
5555
self.close();
@@ -73,7 +73,8 @@ $.widget("ui.tooltip", {
7373
return this.tooltip;
7474
},
7575

76-
show: function(target) {
76+
open: function() {
77+
var target = this.element;
7778
// already visible? possible when both focus and mouseover events occur
7879
if (this.current && this.current[0] == target[0])
7980
return;
@@ -83,14 +84,14 @@ $.widget("ui.tooltip", {
8384
var content = this.options.content.call(target[0], function(response) {
8485
// ignore async responses that come in after the tooltip is already hidden
8586
if (self.current == target)
86-
self.open(target, response);
87+
self._show(target, response);
8788
});
8889
if (content) {
89-
self.open(target, content);
90+
self._show(target, content);
9091
}
9192
},
9293

93-
open: function(target, content) {
94+
_show: function(target, content) {
9495
if (!content)
9596
return;
9697

@@ -115,7 +116,7 @@ $.widget("ui.tooltip", {
115116
else
116117
this.tooltip.is(':visible') ? this.tooltip.fadeTo("normal", this.opacity) : this.tooltip.fadeIn();
117118

118-
this._trigger("show", null, { target: target });
119+
this._trigger( "open" );
119120
},
120121

121122
close: function() {
@@ -136,6 +137,7 @@ $.widget("ui.tooltip", {
136137
else
137138
this.tooltip.stop().fadeOut();
138139

140+
this._trigger( "close" );
139141
}
140142

141143
});

0 commit comments

Comments
 (0)