aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.tooltip.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-12-20 00:32:28 +0100
committerFelix Nagel <info@felixnagel.com>2012-12-20 00:32:28 +0100
commitdab7bf89933c15132b81eaee46a0220357fb27cd (patch)
tree2c3dfbdedfdcc01a86f5a04380cee320f3cd2a41 /ui/jquery.ui.tooltip.js
parent50d7a969a52d4aa1a6c8ae8a3013374fc24aabe1 (diff)
parent209443d716587d896ffcdf26c0fd8c8a23437b3c (diff)
downloadjquery-ui-dab7bf89933c15132b81eaee46a0220357fb27cd.tar.gz
jquery-ui-dab7bf89933c15132b81eaee46a0220357fb27cd.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.tooltip.js')
-rw-r--r--ui/jquery.ui.tooltip.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 3984826ce..d44ff8d06 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -270,7 +270,7 @@ $.widget( "ui.tooltip", {
// as the tooltip is visible, position the tooltip using the most recent
// event.
if ( this.options.show && this.options.show.delay ) {
- delayedShow = setInterval(function() {
+ delayedShow = this.delayedShow = setInterval(function() {
if ( tooltip.is( ":visible" ) ) {
position( positionOption.of );
clearInterval( delayedShow );
@@ -312,6 +312,9 @@ $.widget( "ui.tooltip", {
return;
}
+ // Clear the interval for delayed tracking tooltips
+ clearInterval( this.delayedShow );
+
// only set title if we had one before (see comment in _open())
if ( target.data( "ui-tooltip-title" ) ) {
target.attr( "title", target.data( "ui-tooltip-title" ) );