diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index 4560418ab9..e6f1c7bb65 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 = $( "