Merge branch 'master' into effects-unit

1 files changed, 6 insertions, 6 deletions

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 534b3c947..20638cba5 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -24,9 +24,8 @@ $.widget("ui.tooltip", {
 			return $( this ).attr( "title" );
 		},
 		position: {
-			my: "left center",
-			at: "right center",
-			offset: "15 0"
+			my: "left+15 center",
+			at: "right center"
 		}
 	},
 	_create: function() {
@@ -90,8 +89,8 @@ $.widget("ui.tooltip", {
 			of: target
 		}, this.options.position ) ).hide();
 
-
-		tooltip.fadeIn();
+		tooltip.stop( true );
+		this._show( tooltip, this.options.show );
 
 		this._trigger( "open", event );
 
@@ -111,7 +110,8 @@ $.widget("ui.tooltip", {
 		var tooltip = this._find( target );
 		target.removeAttr( "aria-describedby" );
 		
-		tooltip.fadeOut( function() {
+		tooltip.stop( true );
+		this._hide( tooltip, this.options.hide, function() {
 			$( this ).remove();
 		});