Tooltip: Pass the tooltip element in the open and close events.

diff --git a/demos/tooltip/custom-animation.html b/demos/tooltip/custom-animation.html
index e96960f472bf7b46831240365e53b1f59c410ebf..c7d1aa5b8a7584729ea1ecf909121d9ab5ef38f5 100644 (file)
--- a/demos/tooltip/custom-animation.html
+++ b/demos/tooltip/custom-animation.html
@@ -26,16 +26,14 @@
                                delay: 250
                        }
                });
-               $( "#position-option" ).tooltip({
+               $( "#open-event" ).tooltip({
+                       show: null,
                        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" );
-                               }
+                               at: "left bottom"
+                       },
+                       open: function( event, ui ) {
+                               ui.tooltip.animate({ top: ui.tooltip.position().top + 10 }, "fast" );
                        }
                });
        });
@@ -48,16 +46,15 @@
 <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="slide down on show">show</a> and
 <a id="hide-option" href="http://jqueryui.com/demos/tooltip/#option-hide" title="explode on hide">hide</a> options.</p>
-<p>You can also use the <a id="position-option" href="http://jqueryui.com/demos/tooltip/#option-position" title="move down on show">position option</a>.</p>
+<p>You can also use the <a id="open-event" href="http://jqueryui.com/demos/tooltip/#event-open" title="move down on show">open event</a>.</p>
 
 </div><!-- End demo -->
 
 
 
 <div class="demo-description">
-<p>This demo shows how to customize animations. The tooltip is shown, after a
-delay of 250ms, using a slide down animation, and hidden, after another delay,
-without an animation.</p>
+<p>This demo shows how to customize animations using the show and hide options,
+as well as the open event.</p>
 </div><!-- End demo-description -->
 
 </body>

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index a6ccc07bc2b154d4dacd0754d25ce71cb9543865..f19061bc3019bc6307a03115fa7ca0677e44eb81 100644 (file)
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -138,16 +138,13 @@ $.widget( "ui.tooltip", {
                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 ) );
+                               of: target
+                       }, this.options.position ) )
+                       .hide();
 
                this._show( tooltip, this.options.show );
 
-               this._trigger( "open", event );
+               this._trigger( "open", event, { tooltip: tooltip } );
 
                this._bind( target, {
                        mouseleave: "close",
@@ -181,7 +178,7 @@ $.widget( "ui.tooltip", {
 
                target.unbind( "mouseleave.tooltip blur.tooltip" );
 
-               this._trigger( "close", event );
+               this._trigger( "close", event, { tooltip: tooltip } );
        },
 
        _tooltip: function( element ) {