Tooltip: Overhaul widget animations code to allow delay with plain show/hide

1 files changed, 16 insertions, 5 deletions

diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 9634eaa1f..a5c59ad3c 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -365,12 +365,23 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
 		if ( hasOptions && $.effects && $.effects[ effectName ] ) {
 			element[ method ]( options );
 		} else if ( element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element[ method ]();
-			if ( callback ) {
-				callback.call( element[ 0 ] );
+			if ( /show|hide/.test( effectName ) ) {
+				element.queue( function() {
+					element[ effectName ]();
+					if ( callback ) {
+						callback.call( element[ 0 ] );
+					}
+				});
+			} else {
+				element[ effectName ]( options.duration, options.easing, callback );
 			}
+		} else {
+			element.queue( function() {
+				$( this )[ method ]();
+				if ( callback ) {
+					callback.call( element[ 0 ] );
+				}
+			});
 		}
 	};
 });