Tooltip: Register event handlers before content is loaded

Fixes #8740
Closes gh-1053
Closes gh-1456

diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index 2d49533f24f6366fc06810c49eac01fbe378b4aa..32f7395446a559f7396fe9a1b4c245f3511044a8 100644 (file)
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -71,6 +71,28 @@ asyncTest( "content: sync + async callback", function() {
        }).tooltip( "open" );
 });
 
+// http://bugs.jqueryui.com/ticket/8740
+asyncTest( "content: async callback loses focus before load", function() {
+       expect( 1 );
+
+       var element = $( "#tooltipped1" ).tooltip({
+               content: function( response ) {
+                       setTimeout(function() {
+                               element.trigger( "mouseleave" );
+                               setTimeout(function() {
+                                       response( "sometext" );
+                                       setTimeout(function() {
+                                               ok( !$( "#" + element.data( "ui-tooltip-id" ) ).is( ":visible" ),
+                                                       "Tooltip should not display" );
+                                               start();
+                                       });
+                               });
+                       });
+               }
+       });
+       element.trigger( "mouseover" );
+});
+
 test( "content: change while open", function() {
        expect( 2 ) ;
        var element = $( "#tooltipped1" ).tooltip({

diff --git a/ui/tooltip.js b/ui/tooltip.js
index 6a9039afe97d867e0c5025d821d0399072735f2a..9e4c3453e48280baf713ea26238fbddad8edfe90 100644 (file)
--- a/ui/tooltip.js
+++ b/ui/tooltip.js
@@ -199,6 +199,7 @@ return $.widget( "ui.tooltip", {
                        });
                }
 
+               this._registerCloseHandlers( event, target );
                this._updateContent( target, event );
        },
 
@@ -214,13 +215,16 @@ return $.widget( "ui.tooltip", {
                }
 
                content = contentOption.call( target[0], function( response ) {
-                       // ignore async response if tooltip was closed already
-                       if ( !target.data( "ui-tooltip-open" ) ) {
-                               return;
-                       }
+
                        // IE may instantly serve a cached response for ajax requests
                        // delay this call to _open so the other call to _open runs first
                        that._delay(function() {
+
+                               // Ignore async response if tooltip was closed already
+                               if ( !target.data( "ui-tooltip-open" ) ) {
+                                       return;
+                               }
+
                                // jQuery creates a special event for focusin when it doesn't
                                // exist natively. To improve performance, the native event
                                // object is reused and the type is changed. Therefore, we can't
@@ -238,7 +242,7 @@ return $.widget( "ui.tooltip", {
        },
 
        _open: function( event, target, content ) {
-               var tooltipData, tooltip, events, delayedShow, a11yContent,
+               var tooltipData, tooltip, delayedShow, a11yContent,
                        positionOption = $.extend( {}, this.options.position );
 
                if ( !content ) {
@@ -316,8 +320,10 @@ return $.widget( "ui.tooltip", {
                }
 
                this._trigger( "open", event, { tooltip: tooltip } );
+       },
 
-               events = {
+       _registerCloseHandlers: function( event, target ) {
+               var events = {
                        keyup: function( event ) {
                                if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
                                        var fakeEvent = $.Event(event);
@@ -331,7 +337,7 @@ return $.widget( "ui.tooltip", {
                // tooltips will handle this in destroy.
                if ( target[ 0 ] !== this.element[ 0 ] ) {
                        events.remove = function() {
-                               this._removeTooltip( tooltip );
+                               this._removeTooltip( this._find( target ).tooltip );
                        };
                }
 
@@ -352,6 +358,12 @@ return $.widget( "ui.tooltip", {
 
                // The tooltip may already be closed
                if ( !tooltipData ) {
+
+                       // We set ui-tooltip-open immediately upon open (in open()), but only set the
+                       // additional data once there's actually content to show (in _open()). So even if the
+                       // tooltip doesn't have full data, we always remove ui-tooltip-open in case we're in
+                       // the period between open() and _open().
+                       target.removeData( "ui-tooltip-open" );
                        return;
                }