From e7be72ff06d4152245a674c37abc7e8577bfc7a1 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 27 May 2011 20:05:20 -0400
Subject: Tooltip: Coding standards.

---
 ui/jquery.ui.tooltip.js | 84 ++++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index a8a44f1c0..b781174c9 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -12,7 +12,7 @@
  *	jquery.ui.widget.js
  *	jquery.ui.position.js
  */
-(function($) {
+(function( $ ) {
 
 var increments = 0;
 
@@ -28,63 +28,68 @@ $.widget("ui.tooltip", {
 			at: "right center"
 		}
 	},
+
 	_create: function() {
-		this._bind( {
+		this._bind({
 			mouseover: "open",
 			focusin: "open"
 		});
 	},
-	
+
 	enable: function() {
 		this.options.disabled = false;
 	},
-	
+
 	disable: function() {
 		// only set option, disable element style changes
 		this.options.disabled = true;
 	},
-	
-	open: function(event) {
-		var target = $(event && event.target || this.element).closest(this.options.items);
+
+	open: function( event ) {
+		var target = $( event ? event.target : this.element ).closest( this.options.items );
 		if ( !target.length ) {
 			return;
 		}
-		var self = this;
-		if ( !target.data("tooltip-title") ) {
-			target.data("tooltip-title", target.attr("title"));
+
+		var that = this;
+		if ( !target.data( "tooltip-title" ) ) {
+			target.data( "tooltip-title", target.attr( "title" ) );
 		}
-		var content = this.options.content.call(target[0], function(response) {
+		var content = this.options.content.call( target[0], function( response ) {
 			// IE may instantly serve a cached response, need to give it a chance to finish with _open before that
 			setTimeout(function() {
 				// when undefined, it got removeAttr, then ignore (ajax response)
-				// intially its an empty string, so not undefined
+				// initially its an empty string, so not undefined
 				// TODO is there a better approach to enable ajax tooltips to have two updates?
-				if (target.attr( "aria-describedby" ) !== undefined) {
-					self._open(event, target, response);
+				if ( target.attr( "aria-describedby" ) !== undefined ) {
+					that._open( event, target, response );
 				}
-			}, 13);
+			}, 13 );
 		});
-		if (content) {
-			self._open(event, target, content);
+		if ( content ) {
+			that._open( event, target, content );
 		}
 	},
-	
+
 	_open: function( event, target, content ) {
-		if ( !content )
+		if ( !content ) {
 			return;
+		}
 
-		target.attr("title", "");
+		target.attr( "title", "" );
 
-		if ( this.options.disabled )
+		// TODO: why is this check after we clear the title?
+		if ( this.options.disabled ) {
 			return;
+		}
 
 		// ajaxy tooltip can update an existing one
 		var tooltip = this._find( target );
-		if (!tooltip.length) {
+		if ( !tooltip.length ) {
 			tooltip = this._tooltip();
 			target.attr( "aria-describedby", tooltip.attr( "id" ) );
 		}
-		tooltip.find(".ui-tooltip-content").html( content );
+		tooltip.find( ".ui-tooltip-content" ).html( content );
 		tooltip.position( $.extend({
 			of: target
 		}, this.options.position ) ).hide();
@@ -100,36 +105,37 @@ $.widget("ui.tooltip", {
 			click: "close"
 		});
 	},
-	
+
 	close: function( event ) {
-		var target = $( event && event.currentTarget || this.element );
+		var target = $( event ? event.currentTarget : this.element );
 		target.attr( "title", target.data( "tooltip-title" ) );
-		
-		if ( this.options.disabled )
+
+		if ( this.options.disabled ) {
 			return;
+		}
 
 		var tooltip = this._find( target );
 		target.removeAttr( "aria-describedby" );
-		
+
 		tooltip.stop( true );
 		this._hide( tooltip, this.options.hide, function() {
 			$( this ).remove();
 		});
-		
+
 		target.unbind( "mouseleave.tooltip blur.tooltip" );
-		
+
 		this._trigger( "close", event );
 	},
 
 	_tooltip: function() {
-		var tooltip = $( "<div></div>" )
-			.attr( "id", "ui-tooltip-" + increments++ )
-			.attr( "role", "tooltip" )
-			.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content" );
-		if (this.options.tooltipClass) {
-			tooltip.addClass(this.options.tooltipClass);
-		}
-		$( "<div></div>" )
+		var tooltip = $( "<div>" )
+			.attr({
+				id: "ui-tooltip-" + increments++,
+				role: "tooltip"
+			})
+			.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content" +
+				( this.options.tooltipClass || "" ) );
+		$( "<div>" )
 			.addClass( "ui-tooltip-content" )
 			.appendTo( tooltip );
 		tooltip.appendTo( document.body );
@@ -144,4 +150,4 @@ $.widget("ui.tooltip", {
 
 $.ui.tooltip.version = "@VERSION";
 
-})(jQuery);
\ No newline at end of file
+}( jQuery ) );
-- 
cgit v1.2.3


From d4f6f17c8de859bcc4b76e15e523fb8b74703afe Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 10:18:39 -0400
Subject: Tooltip: Changed custom animation demo and changed the logic for
 showing tooltips so custom position options can perform animations.

---
 demos/tooltip/custom-animation.html | 40 +++++++++++++++++++++----------------
 ui/jquery.ui.tooltip.js             | 13 ++++++++----
 ui/jquery.ui.widget.js              |  2 +-
 3 files changed, 33 insertions(+), 22 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/demos/tooltip/custom-animation.html b/demos/tooltip/custom-animation.html
index 23fa9aefe..b8f012d91 100644
--- a/demos/tooltip/custom-animation.html
+++ b/demos/tooltip/custom-animation.html
@@ -9,25 +9,35 @@
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.tooltip.js"></script>
+	<script src="../../ui/jquery.effects.core.js"></script>
+	<script src="../../ui/jquery.effects.explode.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<style>
-	label {
-		display: inline-block;
-		width: 5em;
-	}
-	</style>
 	<script>
 	$(function() {
-		$( ".demo" ).tooltip({
+		$( "#show-option" ).tooltip({
 			show: {
 				effect: "slideDown",
 				delay: 250
-			},
+			}
+		});
+		$( "#hide-option" ).tooltip({
 			hide: {
-				effect: "hide",
+				effect: "explode",
 				delay: 250
 			}
 		});
+		$( "#position-option" ).tooltip({
+			position: {
+				my: "left top",
+				at: "left bottom+10",
+				using: function( pos ) {
+					$( this ).css({
+						left: pos.left,
+						top: pos.top - 10
+					}).animate({ top: pos.top }, "fast" );
+				}
+			}
+		});
 	});
 	</script>
 </head>
@@ -35,14 +45,10 @@
 
 <div class="demo">
 
-<p><a href="#" title="That's what this widget is">Tooltips</a> can be attached to any element. When you hover
-the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.</p>
-<p>But as it's not a native tooltip, it can be styled. Any themes built with
-<a href="http://themeroller.com" title="ThemeRoller: jQuery UI's theme builder application">ThemeRoller</a>
-will also style tooltips accordingly.</p>
-<p>Tooltips are also useful for form elements, to show some additional information in the context of each field.</p>
-<p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes."></p>
-<p>Hover the field to see the tooltip.</p>
+<p>There are various ways to customize the animation of a tooltip.</p>
+<p>You can use the <a id="show-option" href="http://jqueryui.com/demos/tooltip/#option-show" title="show effect">show</a> and
+<a id="hide-option" href="http://jqueryui.com/demos/tooltip/#option-hide" title="hide effect">hide</a> options.</p>
+<p>You can also use the <a id="position-option" href="http://jqueryui.com/demos/tooltip/#option-position" title="position option">position option</a>.</p>
 
 </div><!-- End demo -->
 
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index b781174c9..c0aaa4fbe 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -90,11 +90,16 @@ $.widget("ui.tooltip", {
 			target.attr( "aria-describedby", tooltip.attr( "id" ) );
 		}
 		tooltip.find( ".ui-tooltip-content" ).html( content );
-		tooltip.position( $.extend({
-			of: target
-		}, this.options.position ) ).hide();
+		tooltip
+			.stop( true )
+			.position( $.extend({
+				of: target,
+				using: function( pos ) {
+					// we only want to hide if there's no custom using defined
+					$( this ).css( pos ).hide();
+				}
+			}, this.options.position ) );
 
-		tooltip.stop( true );
 		this._show( tooltip, this.options.show );
 
 		this._trigger( "open", event );
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 4167fd4e5..3bf735cd3 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -379,7 +379,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
 		var hasOptions = !$.isEmptyObject( options ),
 			effectName = options.effect || defaultEffect;
 		options.complete = callback;
-		if (options.delay) {
+		if ( options.delay ) {
 			element.delay( options.delay );
 		}
 		if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) {
-- 
cgit v1.2.3


From d43118dfbab9591caa5181a9e50608921d19bd5b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 11:43:57 -0400
Subject: Tooltip: Cleanup.

---
 ui/jquery.ui.tooltip.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index c0aaa4fbe..756fe0f7b 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -16,7 +16,7 @@
 
 var increments = 0;
 
-$.widget("ui.tooltip", {
+$.widget( "ui.tooltip", {
 	options: {
 		tooltipClass: null,
 		items: "[title]",
@@ -56,7 +56,8 @@ $.widget("ui.tooltip", {
 			target.data( "tooltip-title", target.attr( "title" ) );
 		}
 		var content = this.options.content.call( target[0], function( response ) {
-			// IE may instantly serve a cached response, need to give it a chance to finish with _open before that
+			// IE may instantly serve a cached response for ajax requests
+			// delay this call to _open so the other call to _open runs first
 			setTimeout(function() {
 				// when undefined, it got removeAttr, then ignore (ajax response)
 				// initially its an empty string, so not undefined
@@ -64,7 +65,7 @@ $.widget("ui.tooltip", {
 				if ( target.attr( "aria-describedby" ) !== undefined ) {
 					that._open( event, target, response );
 				}
-			}, 13 );
+			}, 1 );
 		});
 		if ( content ) {
 			that._open( event, target, content );
@@ -127,6 +128,7 @@ $.widget("ui.tooltip", {
 			$( this ).remove();
 		});
 
+		// TODO: why isn't click unbound here?
 		target.unbind( "mouseleave.tooltip blur.tooltip" );
 
 		this._trigger( "close", event );
@@ -149,7 +151,7 @@ $.widget("ui.tooltip", {
 
 	_find: function( target ) {
 		var id = target.attr( "aria-describedby" );
-		return id ? $( document.getElementById( id ) ) : $();
+		return id ? $( "#" + id ) : $();
 	}
 });
 
-- 
cgit v1.2.3


From 2f3284811c867408652bea044849085bda923b34 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 15:25:05 -0400
Subject: Tooltip: Proper handled of disabled option.

---
 ui/jquery.ui.tooltip.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 756fe0f7b..56e5fa5c2 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -36,13 +36,13 @@ $.widget( "ui.tooltip", {
 		});
 	},
 
-	enable: function() {
-		this.options.disabled = false;
-	},
-
-	disable: function() {
+	_setOption: function( key, value ) {
 		// only set option, disable element style changes
-		this.options.disabled = true;
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+			return;
+		}
+		this._super( "_setOption", key, value );
 	},
 
 	open: function( event ) {
-- 
cgit v1.2.3


From 6a5b21fda2730a0650e0144658d47b9b01bffc64 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 15:39:55 -0400
Subject: All: Moved version numbers into prototypes. Fixed #7436 - Widget:
 Store version numbers on instances.

---
 ui/jquery.ui.accordion.js    | 2 +-
 ui/jquery.ui.autocomplete.js | 2 +-
 ui/jquery.ui.button.js       | 3 +--
 ui/jquery.ui.dialog.js       | 3 +--
 ui/jquery.ui.draggable.js    | 5 +----
 ui/jquery.ui.droppable.js    | 5 +----
 ui/jquery.ui.menu.js         | 3 +--
 ui/jquery.ui.menubar.js      | 1 +
 ui/jquery.ui.mouse.js        | 1 +
 ui/jquery.ui.popup.js        | 1 +
 ui/jquery.ui.progressbar.js  | 5 +----
 ui/jquery.ui.resizable.js    | 5 +----
 ui/jquery.ui.selectable.js   | 5 +----
 ui/jquery.ui.slider.js       | 6 +-----
 ui/jquery.ui.sortable.js     | 5 +----
 ui/jquery.ui.spinner.js      | 3 +--
 ui/jquery.ui.tabs.js         | 5 +----
 ui/jquery.ui.tooltip.js      | 3 +--
 ui/jquery.ui.widget.js       | 2 +-
 19 files changed, 19 insertions(+), 46 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index c6b33befb..7602ae9bc 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -15,6 +15,7 @@
 
 // TODO: use ui-accordion-header-active class and fix styling
 $.widget( "ui.accordion", {
+	version: "@VERSION",
 	options: {
 		active: 0,
 		animated: "slide",
@@ -432,7 +433,6 @@ $.widget( "ui.accordion", {
 });
 
 $.extend( $.ui.accordion, {
-	version: "@VERSION",
 	animations: {
 		slide: function( options, additions ) {
 			var showOverflow = options.toShow.css( "overflow" ),
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index 4619949fb..e39b4649e 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -19,6 +19,7 @@
 var requestIndex = 0;
 
 $.widget( "ui.autocomplete", {
+	version: "@VERSION",
 	defaultElement: "<input>",
 	options: {
 		appendTo: "body",
@@ -475,7 +476,6 @@ $.widget( "ui.autocomplete", {
 });
 
 $.extend( $.ui.autocomplete, {
-	version: "@VERSION",
 	escapeRegex: function( value ) {
 		return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
 	},
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 32e00e9e0..482cdc24c 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -41,6 +41,7 @@ var lastActive, startXPos, startYPos, clickDragged,
 	};
 
 $.widget( "ui.button", {
+	version: "@VERSION",
 	defaultElement: "<button>",
 	options: {
 		disabled: null,
@@ -412,6 +413,4 @@ $.widget( "ui.buttonset", {
 	}
 });
 
-$.ui.buttonset.version = "@VERSION";
-
 }( jQuery ) );
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 84b2dd3b3..0eba39842 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -36,6 +36,7 @@ var uiDialogClasses = "ui-dialog ui-widget ui-widget-content ui-corner-all ",
 	};
 
 $.widget("ui.dialog", {
+	version: "@VERSION",
 	options: {
 		autoOpen: true,
 		buttons: {},
@@ -655,8 +656,6 @@ $.widget("ui.dialog", {
 });
 
 $.extend($.ui.dialog, {
-	version: "@VERSION",
-
 	uuid: 0,
 	maxZ: 0,
 
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index f8c187a7a..6475ebd61 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.draggable", $.ui.mouse, {
+	version: "@VERSION",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -502,10 +503,6 @@ $.widget("ui.draggable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.draggable, {
-	version: "@VERSION"
-});
-
 $.ui.plugin.add("draggable", "connectToSortable", {
 	start: function(event, ui) {
 
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js
index 58a1c4bc1..3942c6b8f 100644
--- a/ui/jquery.ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -16,6 +16,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.droppable", {
+	version: "@VERSION",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: '*',
@@ -146,10 +147,6 @@ $.widget("ui.droppable", {
 
 });
 
-$.extend($.ui.droppable, {
-	version: "@VERSION"
-});
-
 $.ui.intersect = function(draggable, droppable, toleranceMode) {
 
 	if (!droppable.offset) return false;
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index 41b2e7a1a..03e14f124 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -16,6 +16,7 @@
 var idIncrement = 0;
 
 $.widget("ui.menu", {
+	version: "@VERSION",
 	defaultElement: "<ul>",
 	delay: 150,
 	options: {
@@ -420,6 +421,4 @@ $.widget("ui.menu", {
 	}
 });
 
-$.ui.menu.version = "@VERSION";
-
 }( jQuery ));
diff --git a/ui/jquery.ui.menubar.js b/ui/jquery.ui.menubar.js
index 2879d079c..671680597 100644
--- a/ui/jquery.ui.menubar.js
+++ b/ui/jquery.ui.menubar.js
@@ -18,6 +18,7 @@
 // TODO when mixing clicking menus and keyboard navigation, focus handling is broken
 // there has to be just one item that has tabindex
 $.widget( "ui.menubar", {
+	version: "@VERSION",
    options: {
       buttons: false,
       menuIcon: false
diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js
index 2fb1389f2..582eaf9c0 100644
--- a/ui/jquery.ui.mouse.js
+++ b/ui/jquery.ui.mouse.js
@@ -18,6 +18,7 @@ $(document).mousedown(function(e) {
 });
 
 $.widget("ui.mouse", {
+	version: "@VERSION",
 	options: {
 		cancel: ':input,option',
 		distance: 1,
diff --git a/ui/jquery.ui.popup.js b/ui/jquery.ui.popup.js
index 10361a35c..c90755fbb 100644
--- a/ui/jquery.ui.popup.js
+++ b/ui/jquery.ui.popup.js
@@ -17,6 +17,7 @@
 var idIncrement = 0;
 
 $.widget( "ui.popup", {
+	version: "@VERSION",
 	options: {
 		position: {
 			my: "left top",
diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js
index e3b25cfd7..187470681 100644
--- a/ui/jquery.ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -14,6 +14,7 @@
 (function( $, undefined ) {
 
 $.widget( "ui.progressbar", {
+	version: "@VERSION",
 	options: {
 		value: 0,
 		max: 100
@@ -100,8 +101,4 @@ $.widget( "ui.progressbar", {
 	}
 });
 
-$.extend( $.ui.progressbar, {
-	version: "@VERSION"
-});
-
 })( jQuery );
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index de24e94dd..673a8fd75 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.resizable", $.ui.mouse, {
+	version: "@VERSION",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -548,10 +549,6 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.resizable, {
-	version: "@VERSION"
-});
-
 /*
  * Resizable Extensions
  */
diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js
index fa7d01122..75f1cee66 100644
--- a/ui/jquery.ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.selectable", $.ui.mouse, {
+	version: "@VERSION",
 	options: {
 		appendTo: 'body',
 		autoRefresh: true,
@@ -259,8 +260,4 @@ $.widget("ui.selectable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.selectable, {
-	version: "@VERSION"
-});
-
 })(jQuery);
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index f0b01d7c0..978155370 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -19,7 +19,7 @@
 var numPages = 5;
 
 $.widget( "ui.slider", $.ui.mouse, {
-
+	version: "@VERSION",
 	widgetEventPrefix: "slide",
 
 	options: {
@@ -659,8 +659,4 @@ $.widget( "ui.slider", $.ui.mouse, {
 
 });
 
-$.extend( $.ui.slider, {
-	version: "@VERSION"
-});
-
 }(jQuery));
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index a8084412f..99798a915 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -15,6 +15,7 @@
 (function( $, undefined ) {
 
 $.widget("ui.sortable", $.ui.mouse, {
+	version: "@VERSION",
 	widgetEventPrefix: "sort",
 	options: {
 		appendTo: "parent",
@@ -1069,8 +1070,4 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 });
 
-$.extend($.ui.sortable, {
-	version: "@VERSION"
-});
-
 })(jQuery);
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index 0a0ebb37e..4a23aca53 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -14,6 +14,7 @@
 (function( $ ) {
 
 $.widget( "ui.spinner", {
+	version: "@VERSION",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
@@ -368,6 +369,4 @@ $.widget( "ui.spinner", {
 	}
 });
 
-$.ui.spinner.version = "@VERSION";
-
 }( jQuery ) );
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 239805b14..515a93ae0 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -19,6 +19,7 @@ function getNextTabId() {
 }
 
 $.widget( "ui.tabs", {
+	version: "@VERSION",
 	options: {
 		active: null,
 		collapsible: false,
@@ -577,10 +578,6 @@ $.widget( "ui.tabs", {
 	}
 });
 
-$.extend( $.ui.tabs, {
-	version: "@VERSION"
-});
-
 // DEPRECATED
 if ( $.uiBackCompat !== false ) {
 
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 56e5fa5c2..4560418ab 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -17,6 +17,7 @@
 var increments = 0;
 
 $.widget( "ui.tooltip", {
+	version: "@VERSION",
 	options: {
 		tooltipClass: null,
 		items: "[title]",
@@ -155,6 +156,4 @@ $.widget( "ui.tooltip", {
 	}
 });
 
-$.ui.tooltip.version = "@VERSION";
-
 }( jQuery ) );
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 3bf735cd3..da52a5a9c 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -49,7 +49,7 @@ $.widget = function( name, base, prototype ) {
 		if ( arguments.length ) {
 			this._createWidget( options, element );
 		}
-	}, $[ namespace ][ name ] );
+	}, $[ namespace ][ name ], { version: prototype.version } );
 
 	var basePrototype = new base();
 	// we need to make the options hash a property directly on the new instance
-- 
cgit v1.2.3


From 2fbd310a159c4f5d54a38b406bb559dc1fb35449 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 16:20:01 -0400
Subject: Tooltip: Added a destroy method to remove generated tooltip elements.

---
 ui/jquery.ui.tooltip.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 4560418ab..e6f1c7bb6 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -35,6 +35,9 @@ $.widget( "ui.tooltip", {
 			mouseover: "open",
 			focusin: "open"
 		});
+
+		// IDs of generated tooltips, needed for destroy
+		this.tooltips = {};
 	},
 
 	_setOption: function( key, value ) {
@@ -114,7 +117,8 @@ $.widget( "ui.tooltip", {
 	},
 
 	close: function( event ) {
-		var target = $( event ? event.currentTarget : this.element );
+		var that = this,
+			target = $( event ? event.currentTarget : this.element );
 		target.attr( "title", target.data( "tooltip-title" ) );
 
 		if ( this.options.disabled ) {
@@ -127,6 +131,7 @@ $.widget( "ui.tooltip", {
 		tooltip.stop( true );
 		this._hide( tooltip, this.options.hide, function() {
 			$( this ).remove();
+			delete that[ this.id ];
 		});
 
 		// TODO: why isn't click unbound here?
@@ -136,9 +141,10 @@ $.widget( "ui.tooltip", {
 	},
 
 	_tooltip: function() {
-		var tooltip = $( "<div>" )
+		var id = "ui-tooltip-" + increments++,
+			tooltip = $( "<div>" )
 			.attr({
-				id: "ui-tooltip-" + increments++,
+				id: id,
 				role: "tooltip"
 			})
 			.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content" +
@@ -147,12 +153,20 @@ $.widget( "ui.tooltip", {
 			.addClass( "ui-tooltip-content" )
 			.appendTo( tooltip );
 		tooltip.appendTo( document.body );
+		this.tooltips[ id ] = true;
 		return tooltip;
 	},
 
 	_find: function( target ) {
 		var id = target.attr( "aria-describedby" );
 		return id ? $( "#" + id ) : $();
+	},
+
+	destroy: function() {
+		$.each( this.tooltips, function( id ) {
+			$( "#" + id ).remove();
+		});
+		this._super( "destroy" );
 	}
 });
 
-- 
cgit v1.2.3


From 4dbfdcede3878415dbf5c777e9e2ce17c6916edc Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 17:36:57 -0400
Subject: Tooltip: Allow content updates via async response regardless of
 whether a sync response came back. Added more tests.

---
 tests/unit/tooltip/tooltip.html       |  2 +-
 tests/unit/tooltip/tooltip_methods.js | 10 ++++---
 tests/unit/tooltip/tooltip_options.js | 50 ++++++++++++++++++++---------------
 ui/jquery.ui.tooltip.js               |  7 +----
 4 files changed, 37 insertions(+), 32 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index d540504ab..21eff51fd 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -37,7 +37,7 @@
 <div>
 	<a id="tooltipped1" href="#" title="anchortitle">anchor</a>
 	<input title="inputtitle">
-	<span id="fixture-span" data-tooltip="text">span</span>
+	<span id="fixture-span" title="title-text">span</span>
 </div>
 
 </div>
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
index 1487672cb..b1b319d96 100644
--- a/tests/unit/tooltip/tooltip_methods.js
+++ b/tests/unit/tooltip/tooltip_methods.js
@@ -3,9 +3,14 @@
 module( "tooltip: methods" );
 
 test( "destroy", function() {
+	expect( 2 );
 	domEqual( "#tooltipped1", function() {
 		$( "#tooltipped1" ).tooltip().tooltip( "destroy" );
 	});
+
+	// make sure that open tooltips are removed on destroy
+	$( "#tooltipped1" ).tooltip().tooltip( "open" ).tooltip( "destroy" );
+	equal( $( ".ui-tooltip" ).length, 0 );
 });
 
 test( "open/close", function() {
@@ -13,12 +18,11 @@ test( "open/close", function() {
 	$.fx.off = true;
 	var element = $( "#tooltipped1" ).tooltip();
 	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
-$( ".ui-tooltip" ).each(function() {
-	console.log( $( this ).html() );
-});
+
 	element.tooltip( "open" );
 	var tooltip = $( "#" + element.attr( "aria-describedby" ) );
 	ok( tooltip.is( ":visible" ) );
+
 	element.tooltip( "close" );
 	ok( tooltip.is( ":hidden" ) );
 	$.fx.off = false;
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index c866d219f..bbbab72ff 100644
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -3,15 +3,21 @@
 module( "tooltip: options" );
 
 test( "items", function() {
-	var event = $.Event( "mouseenter" );
-	event.target = $( "[data-tooltip]" )[ 0 ];
+	expect( 2 );
 	var element = $( "#qunit-fixture" ).tooltip({
-		items: "[data-tooltip]",
-		content: function() {
-			return $( this ).attr( "data-tooltip" );
-		}
-	}).tooltip( "open", event );
-	same( $( "#" + $( "#fixture-span" ).attr( "aria-describedby" ) ).text(), "text" );
+		items: "#fixture-span"
+	});
+
+	var event = $.Event( "mouseenter" );
+	event.target = $( "#fixture-span" )[ 0 ];
+	element.tooltip( "open", event );
+	same( $( "#" + $( "#fixture-span" ).attr( "aria-describedby" ) ).text(), "title-text" );
+
+	// make sure default [title] doesn't get used
+	event.target = $( "#tooltipped1" )[ 0 ];
+	element.tooltip( "open", event );
+	same( $( "#tooltipped1" ).attr( "aria-describedby" ), undefined );
+
 	element.tooltip( "destroy" );
 });
 
@@ -38,22 +44,22 @@ test( "content: return jQuery", function() {
 	same( $( "#" + element.attr( "aria-describedby" ) ).text(), "customstring" );
 });
 
-/*
-TODO broken, probably related to async content
-test("content: callback string", function() {
-	stop();
-	$("#tooltipped1").tooltip({
-		content: function(response) {
-			response("customstring2");
+asyncTest( "content: sync + async callback", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function( response ) {
 			setTimeout(function() {
-				//console.log($("#tooltipped1").attr("aria-describedby"))
-				same( $( "#" + $("#tooltipped1").attr("aria-describedby") ).text(), "customstring2" );
-				start();
-			}, 100)
+				same( $( "#" + element.attr("aria-describedby") ).text(), "loading..." );
+
+				response( "customstring2" );
+				setTimeout(function() {
+					same( $( "#" + element.attr("aria-describedby") ).text(), "customstring2" );
+					start();
+				}, 13 );
+			}, 13 );
+			return "loading...";
 		}
-	}).tooltip("open");
-	
+	}).tooltip( "open" );
 });
-*/
 
 }( jQuery ) );
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index e6f1c7bb6..343c1d055 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -63,12 +63,7 @@ $.widget( "ui.tooltip", {
 			// IE may instantly serve a cached response for ajax requests
 			// delay this call to _open so the other call to _open runs first
 			setTimeout(function() {
-				// when undefined, it got removeAttr, then ignore (ajax response)
-				// initially its an empty string, so not undefined
-				// TODO is there a better approach to enable ajax tooltips to have two updates?
-				if ( target.attr( "aria-describedby" ) !== undefined ) {
-					that._open( event, target, response );
-				}
+				that._open( event, target, response );
 			}, 1 );
 		});
 		if ( content ) {
-- 
cgit v1.2.3


From 215599309660733221d51830d12f2ed117961b36 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 17:55:45 -0400
Subject: Tooltip: Fixed tooltipClass option and added test.

---
 tests/unit/tooltip/tooltip_options.js | 46 ++++++++++++++++++++---------------
 ui/jquery.ui.tooltip.js               |  2 +-
 2 files changed, 28 insertions(+), 20 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index bbbab72ff..04bb4c6a4 100644
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -2,25 +2,6 @@
 
 module( "tooltip: options" );
 
-test( "items", function() {
-	expect( 2 );
-	var element = $( "#qunit-fixture" ).tooltip({
-		items: "#fixture-span"
-	});
-
-	var event = $.Event( "mouseenter" );
-	event.target = $( "#fixture-span" )[ 0 ];
-	element.tooltip( "open", event );
-	same( $( "#" + $( "#fixture-span" ).attr( "aria-describedby" ) ).text(), "title-text" );
-
-	// make sure default [title] doesn't get used
-	event.target = $( "#tooltipped1" )[ 0 ];
-	element.tooltip( "open", event );
-	same( $( "#tooltipped1" ).attr( "aria-describedby" ), undefined );
-
-	element.tooltip( "destroy" );
-});
-
 test( "content: default", function() {
 	var element = $( "#tooltipped1" ).tooltip().tooltip( "open" );
 	same( $( "#" + element.attr( "aria-describedby" ) ).text(), "anchortitle" );
@@ -62,4 +43,31 @@ asyncTest( "content: sync + async callback", function() {
 	}).tooltip( "open" );
 });
 
+test( "items", function() {
+	expect( 2 );
+	var element = $( "#qunit-fixture" ).tooltip({
+		items: "#fixture-span"
+	});
+
+	var event = $.Event( "mouseenter" );
+	event.target = $( "#fixture-span" )[ 0 ];
+	element.tooltip( "open", event );
+	same( $( "#" + $( "#fixture-span" ).attr( "aria-describedby" ) ).text(), "title-text" );
+
+	// make sure default [title] doesn't get used
+	event.target = $( "#tooltipped1" )[ 0 ];
+	element.tooltip( "open", event );
+	same( $( "#tooltipped1" ).attr( "aria-describedby" ), undefined );
+
+	element.tooltip( "destroy" );
+});
+
+test( "tooltipClass", function() {
+	expect( 1 )
+	var element = $( "#tooltipped1" ).tooltip({
+		tooltipClass: "custom"
+	}).tooltip( "open" );
+	ok( $( "#" + element.attr( "aria-describedby" ) ).hasClass( "custom" ) );
+});
+
 }( jQuery ) );
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 343c1d055..a6d3b1dd3 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -142,7 +142,7 @@ $.widget( "ui.tooltip", {
 				id: id,
 				role: "tooltip"
 			})
-			.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content" +
+			.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
 				( this.options.tooltipClass || "" ) );
 		$( "<div>" )
 			.addClass( "ui-tooltip-content" )
-- 
cgit v1.2.3


From 6bc220587e6d13e34f653142ffe3dc694189a7f2 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 19:38:01 -0400
Subject: Tooltip: Fixed tracking of tooltip elements.

---
 ui/jquery.ui.tooltip.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index a6d3b1dd3..fe264ce0d 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -126,7 +126,7 @@ $.widget( "ui.tooltip", {
 		tooltip.stop( true );
 		this._hide( tooltip, this.options.hide, function() {
 			$( this ).remove();
-			delete that[ this.id ];
+			delete that.tooltips[ this.id ];
 		});
 
 		// TODO: why isn't click unbound here?
@@ -157,11 +157,10 @@ $.widget( "ui.tooltip", {
 		return id ? $( "#" + id ) : $();
 	},
 
-	destroy: function() {
+	_destroy: function() {
 		$.each( this.tooltips, function( id ) {
 			$( "#" + id ).remove();
 		});
-		this._super( "destroy" );
 	}
 });
 
-- 
cgit v1.2.3


From 74df32f91e49f47136de99c6bc86de1b9d145c5c Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 20:15:26 -0400
Subject: Tooltip: Removed click handler.

---
 ui/jquery.ui.tooltip.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index fe264ce0d..f2bae00bd 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -106,8 +106,7 @@ $.widget( "ui.tooltip", {
 
 		this._bind( target, {
 			mouseleave: "close",
-			blur: "close",
-			click: "close"
+			blur: "close"
 		});
 	},
 
@@ -129,7 +128,6 @@ $.widget( "ui.tooltip", {
 			delete that.tooltips[ this.id ];
 		});
 
-		// TODO: why isn't click unbound here?
 		target.unbind( "mouseleave.tooltip blur.tooltip" );
 
 		this._trigger( "close", event );
-- 
cgit v1.2.3


From 9e4576bca9508d5d01f3fdf518c6b50c0d110ffb Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 20:19:23 -0400
Subject: Tooltip: Alphabetized options.

---
 tests/unit/tooltip/tooltip_defaults.js | 2 +-
 ui/jquery.ui.tooltip.js                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/tests/unit/tooltip/tooltip_defaults.js b/tests/unit/tooltip/tooltip_defaults.js
index 317ba1aa0..13daaeb67 100644
--- a/tests/unit/tooltip/tooltip_defaults.js
+++ b/tests/unit/tooltip/tooltip_defaults.js
@@ -1,8 +1,8 @@
 commonWidgetTests( "tooltip", {
 	defaults: {
+		content: function() {},
 		disabled: false,
 		items: "[title]",
-		content: function() {},
 		position: {
 			my: "left+15 center",
 			at: "right center"
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index f2bae00bd..236e95ae8 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -19,15 +19,15 @@ var increments = 0;
 $.widget( "ui.tooltip", {
 	version: "@VERSION",
 	options: {
-		tooltipClass: null,
-		items: "[title]",
 		content: function() {
 			return $( this ).attr( "title" );
 		},
+		items: "[title]",
 		position: {
 			my: "left+15 center",
 			at: "right center"
-		}
+		},
+		tooltipClass: null
 	},
 
 	_create: function() {
-- 
cgit v1.2.3


From 8fc6ee6a19e200cedb324ea34076b0f176964894 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 28 May 2011 20:30:14 -0400
Subject: Tooltip: Coding standards.

---
 ui/jquery.ui.tooltip.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 236e95ae8..279db69fa 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -50,16 +50,20 @@ $.widget( "ui.tooltip", {
 	},
 
 	open: function( event ) {
-		var target = $( event ? event.target : this.element ).closest( this.options.items );
+		var content,
+			that = this,
+			target = $( event ? event.target : this.element )
+				.closest( this.options.items );
+
 		if ( !target.length ) {
 			return;
 		}
 
-		var that = this;
 		if ( !target.data( "tooltip-title" ) ) {
 			target.data( "tooltip-title", target.attr( "title" ) );
 		}
-		var content = this.options.content.call( target[0], function( response ) {
+
+		content = this.options.content.call( target[0], function( response ) {
 			// IE may instantly serve a cached response for ajax requests
 			// delay this call to _open so the other call to _open runs first
 			setTimeout(function() {
@@ -112,14 +116,15 @@ $.widget( "ui.tooltip", {
 
 	close: function( event ) {
 		var that = this,
-			target = $( event ? event.currentTarget : this.element );
+			target = $( event ? event.currentTarget : this.element ),
+			tooltip = this._find( target );
+
 		target.attr( "title", target.data( "tooltip-title" ) );
 
 		if ( this.options.disabled ) {
 			return;
 		}
 
-		var tooltip = this._find( target );
 		target.removeAttr( "aria-describedby" );
 
 		tooltip.stop( true );
@@ -136,12 +141,12 @@ $.widget( "ui.tooltip", {
 	_tooltip: function() {
 		var id = "ui-tooltip-" + increments++,
 			tooltip = $( "<div>" )
-			.attr({
-				id: id,
-				role: "tooltip"
-			})
-			.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
-				( this.options.tooltipClass || "" ) );
+				.attr({
+					id: id,
+					role: "tooltip"
+				})
+				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
+					( this.options.tooltipClass || "" ) );
 		$( "<div>" )
 			.addClass( "ui-tooltip-content" )
 			.appendTo( tooltip );
-- 
cgit v1.2.3


From 2a92b3ad8eeeb6e82f197fe599929ee334c76f02 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 May 2011 12:29:11 -0400
Subject: Tooltip: Change default collision detection to 'flip fit' since the
 default vertical positioning is centered and can't flip

---
 demos/tooltip/delegation-mixbag.html   | 106 +++++++++++++++++++--------------
 tests/unit/tooltip/tooltip_defaults.js |   3 +-
 ui/jquery.ui.tooltip.js                |   3 +-
 3 files changed, 66 insertions(+), 46 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/demos/tooltip/delegation-mixbag.html b/demos/tooltip/delegation-mixbag.html
index 9c524dabe..720071c87 100644
--- a/demos/tooltip/delegation-mixbag.html
+++ b/demos/tooltip/delegation-mixbag.html
@@ -1,62 +1,80 @@
 <!doctype html>
 <html lang="en">
 <head>
+	<meta charset="utf-8">
 	<title>jQuery UI Tooltip - Default demo</title>
-	<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
-	<script type="text/javascript" src="../../jquery-1.5.1.js"></script>
-	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
-	<script type="text/javascript" src="../../ui/jquery.ui.tooltip.js"></script>
-	<link type="text/css" href="../demos.css" rel="stylesheet" />
-	<script type="text/javascript">
+	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
+	<script src="../../jquery-1.5.1.js"></script>
+	<script src="../../ui/jquery.ui.core.js"></script>
+	<script src="../../ui/jquery.ui.widget.js"></script>
+	<script src="../../ui/jquery.ui.position.js"></script>
+	<script src="../../ui/jquery.ui.tooltip.js"></script>
+	<link rel="stylesheet" href="../demos.css">
+	<style>
+	.photo {
+		width: 300px;
+		text-align: center;
+	}
+	.photo .ui-widget-header {
+		margin: 1em 0;
+	}
+	</style>
+	<script>
 	$(function() {
-		$(".demo").tooltip({
-			items: "[href], [title]",
-			content: function(response) {
-				var href = $(this).attr("href");
-				if (/^#/.test(href)) {
-					return $(href).html();
-				} else if (href) {
-					$.get(href, response);
-					return "loading...";
+		$( ".demo" ).tooltip({
+			items: "img, [data-geo], [title]",
+			content: function() {
+				var element = $( this );
+				if ( element.is( "[data-geo]" ) ) {
+					return $( "<iframe>", {
+						width: 425,
+						height: 350,
+						frameborder: 0,
+						scrolling: "no",
+						marginheight: 0,
+						marginwidth: 0,
+						src: "http://maps.google.com/maps?ll=" + element.attr( "data-geo" ) +
+							"&z=11&t=p&output=embed"
+					});
+				}
+				if ( element.is( "[title]" ) ) {
+					return $( this ).attr( "title" );
+				}
+				if ( element.is( "img" ) ) {
+					return $( this ).attr( "alt" );
 				}
-				return this.title;
 			}
 		});
-		$("#footnotes").hide();
 	});
 	</script>
-	<style>
-		label { display: inline-block; width: 5em; }
-	</style>
 </head>
 <body>
 
 <div class="demo">
-	<ul>
-		<li>
-			<a href="#footnote1">I'm a link to a footnote.</a>
-		</li>
-		<li>
-			<a href="#footnote2">I'm another link to a footnote.</a>
-		</li>
-	</ul>
-	<input title="This is just an input, nothing special" />
-	
-	<ul>
-		<li>
-			<a href="ajax/content1.html">Link to ajax content, with tooltip preview!</a>
-		</li>
-		<li>
-			<a href="ajax/content2.html">Another link to ajax content, with tooltip preview!</a>
-		</li>
-	</ul>
-	
-	<div id="footnotes">
-		<div id="footnote1">This is <strong>the</strong> footnote, including other elements</div>
-		<div id="footnote2">This is <strong>the other</strong> footnote, including other elements</div>
+
+<div class="ui-widget photo">
+	<div class="ui-widget-header ui-corner-all">
+		<h2>St. Stephen's Cathedral</h2>
+		<h3><a href="http://maps.google.com/maps?q=vienna,+austria&z=11" data-geo="48.208174,16.373819">Vienna, Austria</a>.</h3>
+	</div>
+	<a href="http://en.wikipedia.org/wiki/File:Wien_Stefansdom_DSC02656.JPG">
+		<img src="images/st-stephens.jpg" alt="St. Stephen's Cathedral">
+	</a>
+</div>
+
+<div class="ui-widget photo">
+	<div class="ui-widget-header ui-corner-all">
+		<h2>Tower Bridge</h2>
+		<h3><a href="http://maps.google.com/maps?q=london,+england&z=11" data-geo="51.500152,-0.126236">London, England</a>.</h3>
 	</div>
+	<a href="http://en.wikipedia.org/wiki/File:Tower_bridge_London_Twilight_-_November_2006.jpg">
+		<img src="images/tower-bridge.jpg" alt="Tower Bridge">
+	</a>
+</div>
+
+<p>All images are part of <a href="http://commons.wikimedia.org/wiki/Main_Page">Wikimedia Commons</a>
+and are licensed under <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en" title="Creative Commons Attribution-ShareAlike 3.0">CC BY-SA 3.0</a> by the copyright holder.</p>
+
 </div><!-- End demo -->
 
 
diff --git a/tests/unit/tooltip/tooltip_defaults.js b/tests/unit/tooltip/tooltip_defaults.js
index 13daaeb67..ded3d4558 100644
--- a/tests/unit/tooltip/tooltip_defaults.js
+++ b/tests/unit/tooltip/tooltip_defaults.js
@@ -5,7 +5,8 @@ commonWidgetTests( "tooltip", {
 		items: "[title]",
 		position: {
 			my: "left+15 center",
-			at: "right center"
+			at: "right center",
+			collision: "flip fit"
 		},
 		tooltipClass: null,
 
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 279db69fa..c8d892d38 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -25,7 +25,8 @@ $.widget( "ui.tooltip", {
 		items: "[title]",
 		position: {
 			my: "left+15 center",
-			at: "right center"
+			at: "right center",
+			collision: "flip fit"
 		},
 		tooltipClass: null
 	},
-- 
cgit v1.2.3


From 917d2b135891339cb02ce9cda5721faecae2a3ae Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 May 2011 13:34:37 -0400
Subject: Tooltip: Don't mess with the title attribute if it doesn't exist.
 Prevents the creation of a title attribute if there wasn't one to begin with.

---
 ui/jquery.ui.tooltip.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index c8d892d38..c5d9508f7 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -81,7 +81,13 @@ $.widget( "ui.tooltip", {
 			return;
 		}
 
-		target.attr( "title", "" );
+		// if we have a title, clear it to prevent the native tooltip
+		// we have to check first to avoid defining a title if none exists
+		// (we don't want to cause an element to start matching [title])
+		// TODO: document why we don't use .removeAttr()
+		if ( target.is( "[title]" ) ) {
+			target.attr( "title", "" );
+		}
 
 		// TODO: why is this check after we clear the title?
 		if ( this.options.disabled ) {
@@ -120,7 +126,10 @@ $.widget( "ui.tooltip", {
 			target = $( event ? event.currentTarget : this.element ),
 			tooltip = this._find( target );
 
-		target.attr( "title", target.data( "tooltip-title" ) );
+		// only set title if we had one before (see comment in _open())
+		if ( target.data( "tooltip-title" ) ) {
+			target.attr( "title", target.data( "tooltip-title" ) );
+		}
 
 		if ( this.options.disabled ) {
 			return;
-- 
cgit v1.2.3


From 133fba2ad9b588233f7c7303619ac42351f08926 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 May 2011 19:21:31 -0400
Subject: Tooltip: Don't close tooltips on mouseleave if the element is still
 focused.

---
 tests/unit/tooltip/tooltip_events.js | 26 ++++++++++++++++++++++++++
 ui/jquery.ui.tooltip.js              |  7 +++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js
index 515760b28..61026882e 100644
--- a/tests/unit/tooltip/tooltip_events.js
+++ b/tests/unit/tooltip/tooltip_events.js
@@ -47,4 +47,30 @@ test( "focus events", function() {
 	element.trigger( "blur" );
 });
 
+test( "mixed events", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip();
+
+	element.one( "tooltipopen", function( event ) {
+		same( event.originalEvent.type, "focusin" );
+	});
+	element[0].focus();
+
+	element.one( "tooltipopen", function() {
+		ok( false, "open triggered while already open" );
+	});
+	element.trigger( "mouseover" );
+
+	element.bind( "tooltipclose", function( event ) {
+		ok( false, "close triggered while still focused" );
+	});
+	element.trigger( "mouseleave" );
+	element.unbind( "tooltipclose" );
+
+	element.one( "tooltipclose", function( event ) {
+		same( event.originalEvent.type, "blur" );
+	});
+	element[0].blur();
+});
+
 }( jQuery ) );
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index c5d9508f7..44398a871 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -56,7 +56,8 @@ $.widget( "ui.tooltip", {
 			target = $( event ? event.target : this.element )
 				.closest( this.options.items );
 
-		if ( !target.length ) {
+		// if aria-describedby exists, then the tooltip is already open
+		if ( !target.length || target.attr( "aria-describedby" ) ) {
 			return;
 		}
 
@@ -131,7 +132,9 @@ $.widget( "ui.tooltip", {
 			target.attr( "title", target.data( "tooltip-title" ) );
 		}
 
-		if ( this.options.disabled ) {
+		// don't close if the element has focus
+		// this prevents the tooltip from closing if you hover while focused
+		if ( this.options.disabled || document.activeElement === target[0] ) {
 			return;
 		}
 
-- 
cgit v1.2.3


From 0fc41bcc4d7f084463a8b68f225789964b009d0d Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 May 2011 19:28:35 -0400
Subject: Tooltip: Use bgiframe if available

---
 ui/jquery.ui.tooltip.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 44398a871..7722e6472 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -164,6 +164,9 @@ $.widget( "ui.tooltip", {
 			.addClass( "ui-tooltip-content" )
 			.appendTo( tooltip );
 		tooltip.appendTo( document.body );
+		if ( $.fn.bgiframe ) {
+			tooltip.bgiframe();
+		}
 		this.tooltips[ id ] = true;
 		return tooltip;
 	},
-- 
cgit v1.2.3


From b6cda3dfeeca692fd14e5ecbde93286507e5c560 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 May 2011 19:41:57 -0400
Subject: Tooltip: Added some comments.

---
 ui/jquery.ui.tooltip.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 7722e6472..8aba5974a 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -83,6 +83,9 @@ $.widget( "ui.tooltip", {
 		}
 
 		// if we have a title, clear it to prevent the native tooltip
+		// we do this before the disabled check to prevent native tooltips
+		// even when disabled
+		// TODO: the above doesn't work since ._bind() does a disabled check
 		// we have to check first to avoid defining a title if none exists
 		// (we don't want to cause an element to start matching [title])
 		// TODO: document why we don't use .removeAttr()
@@ -90,7 +93,6 @@ $.widget( "ui.tooltip", {
 			target.attr( "title", "" );
 		}
 
-		// TODO: why is this check after we clear the title?
 		if ( this.options.disabled ) {
 			return;
 		}
-- 
cgit v1.2.3


From 8c085cd27ce5d2c765a2d762a863e52d1fc6308c Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Sun, 29 May 2011 20:50:21 -0400
Subject: Tooltip: Fixed handling of disabled tooltips.

---
 tests/unit/tooltip/tooltip_methods.js | 26 +++++++++++++++
 ui/jquery.ui.tooltip.js               | 61 ++++++++++++++++++++++++-----------
 2 files changed, 69 insertions(+), 18 deletions(-)

(limited to 'ui/jquery.ui.tooltip.js')

diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
index b1b319d96..798d55896 100644
--- a/tests/unit/tooltip/tooltip_methods.js
+++ b/tests/unit/tooltip/tooltip_methods.js
@@ -28,6 +28,32 @@ test( "open/close", function() {
 	$.fx.off = false;
 });
 
+test( "enable/disable", function() {
+	expect( 7 );
+	$.fx.off = true;
+	var element = $( "#tooltipped1" ).tooltip();
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
+
+	element.tooltip( "open" );
+	var tooltip = $( "#" + element.attr( "aria-describedby" ) );
+	ok( tooltip.is( ":visible" ) );
+
+	element.tooltip( "disable" );
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip when disabled" );
+	equal( tooltip.attr( "title" ), "", "title removed on disable" );
+
+	element.tooltip( "open" );
+	equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" );
+
+	element.tooltip( "enable" );
+	equal( element.attr( "title" ), "anchortitle", "title restored on enable" );
+
+	element.tooltip( "open" );
+	tooltip = $( "#" + element.attr( "aria-describedby" ) );
+	ok( tooltip.is( ":visible" ) );
+	$.fx.off = false;
+});
+
 /*
 TODO currently tooltip doesn't override widget
 can't return anything useful if no element is kept around and there's no useful reference
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 8aba5974a..d30e49c66 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -42,14 +42,46 @@ $.widget( "ui.tooltip", {
 	},
 
 	_setOption: function( key, value ) {
-		// only set option, disable element style changes
 		if ( key === "disabled" ) {
+			this[ value ? "_disable" : "_enable" ]();
 			this.options[ key ] = value;
+			// disable element style changes
 			return;
 		}
 		this._super( "_setOption", key, value );
 	},
 
+	_disable: function() {
+		var that = this;
+
+		// close open tooltips
+		$.each( this.tooltips, function( id, element ) {
+			var event = $.Event( "blur" );
+			event.target = event.currentTarget = element[0];
+			that.close( event, true );
+		});
+
+		// remove title attributes to prevent native tooltips
+		this.element.find( this.options.items ).andSelf().each(function() {
+			var element = $( this );
+			if ( element.is( "[title]" ) ) {
+				element
+					.data( "tooltip-title", element.attr( "title" ) )
+					.attr( "title", "" );
+			}
+		});
+	},
+
+	_enable: function() {
+		// restore title attributes
+		this.element.find( this.options.items ).andSelf().each(function() {
+			var element = $( this );
+			if ( element.data( "tooltip-title" ) ) {
+				element.attr( "title", element.data( "tooltip-title" ) );
+			}
+		});
+	},
+
 	open: function( event ) {
 		var content,
 			that = this,
@@ -83,9 +115,6 @@ $.widget( "ui.tooltip", {
 		}
 
 		// if we have a title, clear it to prevent the native tooltip
-		// we do this before the disabled check to prevent native tooltips
-		// even when disabled
-		// TODO: the above doesn't work since ._bind() does a disabled check
 		// we have to check first to avoid defining a title if none exists
 		// (we don't want to cause an element to start matching [title])
 		// TODO: document why we don't use .removeAttr()
@@ -93,14 +122,10 @@ $.widget( "ui.tooltip", {
 			target.attr( "title", "" );
 		}
 
-		if ( this.options.disabled ) {
-			return;
-		}
-
 		// ajaxy tooltip can update an existing one
 		var tooltip = this._find( target );
 		if ( !tooltip.length ) {
-			tooltip = this._tooltip();
+			tooltip = this._tooltip( target );
 			target.attr( "aria-describedby", tooltip.attr( "id" ) );
 		}
 		tooltip.find( ".ui-tooltip-content" ).html( content );
@@ -124,22 +149,22 @@ $.widget( "ui.tooltip", {
 		});
 	},
 
-	close: function( event ) {
+	close: function( event, force ) {
 		var that = this,
 			target = $( event ? event.currentTarget : this.element ),
 			tooltip = this._find( target );
 
-		// only set title if we had one before (see comment in _open())
-		if ( target.data( "tooltip-title" ) ) {
-			target.attr( "title", target.data( "tooltip-title" ) );
-		}
-
 		// don't close if the element has focus
 		// this prevents the tooltip from closing if you hover while focused
-		if ( this.options.disabled || document.activeElement === target[0] ) {
+		if ( !force && document.activeElement === target[0] ) {
 			return;
 		}
 
+		// only set title if we had one before (see comment in _open())
+		if ( target.data( "tooltip-title" ) ) {
+			target.attr( "title", target.data( "tooltip-title" ) );
+		}
+
 		target.removeAttr( "aria-describedby" );
 
 		tooltip.stop( true );
@@ -153,7 +178,7 @@ $.widget( "ui.tooltip", {
 		this._trigger( "close", event );
 	},
 
-	_tooltip: function() {
+	_tooltip: function( element ) {
 		var id = "ui-tooltip-" + increments++,
 			tooltip = $( "<div>" )
 				.attr({
@@ -169,7 +194,7 @@ $.widget( "ui.tooltip", {
 		if ( $.fn.bgiframe ) {
 			tooltip.bgiframe();
 		}
-		this.tooltips[ id ] = true;
+		this.tooltips[ id ] = element;
 		return tooltip;
 	},
 
-- 
cgit v1.2.3