From 6204e1a3c4197d4c612e786337ee371295364ee2 Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Thu, 8 Apr 2010 23:21:47 +0200
Subject: The accidental merge of tooltip into master was reverted in master,
 that revert got merged back into tooltip; now reverting that revert to get
 the tooltip stuff back, should then make it easy to merge into master once
 tooltip is done

---
 themes/base/jquery.ui.base.css    |  1 +
 themes/base/jquery.ui.tooltip.css | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 themes/base/jquery.ui.tooltip.css

(limited to 'themes')

diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index eed06a277..b6a74984b 100644
--- a/themes/base/jquery.ui.base.css
+++ b/themes/base/jquery.ui.base.css
@@ -9,3 +9,4 @@
 @import url("jquery.ui.resizable.css");
 @import url("jquery.ui.slider.css");
 @import url("jquery.ui.tabs.css");
+@import url("jquery.ui.tooltip.css");
diff --git a/themes/base/jquery.ui.tooltip.css b/themes/base/jquery.ui.tooltip.css
new file mode 100644
index 000000000..6d8e988bd
--- /dev/null
+++ b/themes/base/jquery.ui.tooltip.css
@@ -0,0 +1,14 @@
+/* Tooltip
+----------------------------------*/
+.ui-tooltip {
+	padding:8px; width:100px; position:absolute; z-index:9999;
+	-o-box-shadow: 0 0 5px #aaa;
+	-moz-box-shadow: 0 0 5px #aaa;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+/* Fades and background-images don't work well together in IE6, drop the image */
+* html .ui-tooltip {
+	background-image: none;
+}
+body .ui-tooltip { border-width:2px; }
-- 
cgit v1.2.3


From e7882fa393dcd5effb8a8997f99622ab88774cad Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Thu, 8 Apr 2010 23:41:49 +0200
Subject: Use tooltip to display hint when combobox input doesn't match
 anything

---
 demos/autocomplete/combobox.html  | 18 +++++++++++++++---
 themes/base/jquery.ui.tooltip.css |  5 ++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'themes')

diff --git a/demos/autocomplete/combobox.html b/demos/autocomplete/combobox.html
index 3001f7d17..596423bc9 100644
--- a/demos/autocomplete/combobox.html
+++ b/demos/autocomplete/combobox.html
@@ -10,6 +10,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tooltip.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		/* TODO shouldn't be necessary */
@@ -41,8 +42,12 @@
 						delay: 0,
 						change: function(event, ui) {
 							if (!ui.item) {
-								// remove invalid value, as it didn't match anything
-								$(this).val("");
+								var value = this.value;
+								// remove invalid value, as it didn't match anything, and display a hint
+								$(this).val("").attr("title", value + " didn't match any item").tooltip("open");
+								setTimeout(function() {
+									input.tooltip("close").attr("title", "");
+								}, 2500);
 								return false;
 							}
 							select.val(ui.item.id);
@@ -54,7 +59,7 @@
 						minLength: 0
 					})
 					.addClass("ui-widget ui-widget-content ui-corner-left");
-				$("<button>&nbsp;</button>")
+				var button = $("<button>&nbsp;</button>")
 				.attr("tabIndex", -1)
 				.attr("title", "Show All Items")
 				.insertAfter(input)
@@ -75,6 +80,13 @@
 					input.autocomplete("search", "");
 					input.focus();
 				});
+				
+				input.tooltip({
+					position: {
+						offset: (button.width() + 5) + " 0"
+					},
+					tooltipClass: "ui-state-highlight"
+				});
 			}
 		});
 
diff --git a/themes/base/jquery.ui.tooltip.css b/themes/base/jquery.ui.tooltip.css
index 6d8e988bd..652bf3386 100644
--- a/themes/base/jquery.ui.tooltip.css
+++ b/themes/base/jquery.ui.tooltip.css
@@ -1,7 +1,10 @@
 /* Tooltip
 ----------------------------------*/
 .ui-tooltip {
-	padding:8px; width:100px; position:absolute; z-index:9999;
+	padding:8px;
+	width:125px;
+	position:absolute;
+	z-index:9999;
 	-o-box-shadow: 0 0 5px #aaa;
 	-moz-box-shadow: 0 0 5px #aaa;
 	-webkit-box-shadow: 0 0 5px #aaa;
-- 
cgit v1.2.3


From 19b76a14a85c000996e22a6377ff86dc931bbc1e Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Wed, 21 Apr 2010 20:00:45 +0200
Subject: Tooltip: Remove fixed with from tooltip theme, set in instead in CSS
 where actually necessary

---
 demos/tooltip/forms.html          | 4 +++-
 demos/tooltip/index.html          | 6 ++----
 themes/base/jquery.ui.tooltip.css | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'themes')

diff --git a/demos/tooltip/forms.html b/demos/tooltip/forms.html
index 626161d6e..ac0529680 100644
--- a/demos/tooltip/forms.html
+++ b/demos/tooltip/forms.html
@@ -26,7 +26,7 @@
 		fieldset div {
 			margin-bottom: 2em;
 		}
-		.ui-tooltip { width: 200px; }
+		.ui-tooltip { width: 210px; }
 	</style>
 </head>
 <body>
@@ -61,6 +61,8 @@
 
 <p>Hover the questionmark-buttons or use the button below to display the help texts all at once. Click again to hide them.</p>
 
+<p>A fixed width is defined in CSS to make the tooltips look consistent when displayed all at once.</p>
+
 </div><!-- End demo-description -->
 
 
diff --git a/demos/tooltip/index.html b/demos/tooltip/index.html
index ed5cd10e5..9b1efefe4 100644
--- a/demos/tooltip/index.html
+++ b/demos/tooltip/index.html
@@ -10,10 +10,8 @@
 	<h4>Examples</h4>
 	<ul>
 		<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
-		<!--
-		<li><a href="foo.html">Foo</a></li>
-		<li><a href="bar.html">Bar</a></li>
-		-->
+		<li><a href="forms.html">Forms with tooltips</a></li>
+		<li><a href="tracking.html">Track the mouse</a></li>
 	</ul>
 </div>
 
diff --git a/themes/base/jquery.ui.tooltip.css b/themes/base/jquery.ui.tooltip.css
index 652bf3386..145b079d2 100644
--- a/themes/base/jquery.ui.tooltip.css
+++ b/themes/base/jquery.ui.tooltip.css
@@ -2,7 +2,6 @@
 ----------------------------------*/
 .ui-tooltip {
 	padding:8px;
-	width:125px;
 	position:absolute;
 	z-index:9999;
 	-o-box-shadow: 0 0 5px #aaa;
-- 
cgit v1.2.3