aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.tooltip.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-07-28 15:16:20 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-07-28 15:16:20 +0200
commit5a45f483d73578dd147229d412998bba4a44c35b (patch)
tree540e9c5ca8502fa0277d072de973a9c676134793 /ui/jquery.ui.tooltip.js
parent5297b7bc4250462213b05ad2763fe99d0f8dedec (diff)
parent0ba493d3b4f9d6da35cadc499e9f7ebb6adb31b3 (diff)
downloadjquery-ui-5a45f483d73578dd147229d412998bba4a44c35b.tar.gz
jquery-ui-5a45f483d73578dd147229d412998bba4a44c35b.zip
Merge branch 'master' into widget-delegation
Diffstat (limited to 'ui/jquery.ui.tooltip.js')
-rw-r--r--ui/jquery.ui.tooltip.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index f19061bc3..5e32459fc 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -148,7 +148,14 @@ $.widget( "ui.tooltip", {
this._bind( target, {
mouseleave: "close",
- blur: "close"
+ blur: "close",
+ keyup: function( event ) {
+ if ( event.keyCode == $.ui.keyCode.ESCAPE ) {
+ var fakeEvent = $.Event(event);
+ fakeEvent.currentTarget = target[0];
+ this.close( fakeEvent, true );
+ }
+ }
});
},
@@ -176,7 +183,7 @@ $.widget( "ui.tooltip", {
delete that.tooltips[ this.id ];
});
- target.unbind( "mouseleave.tooltip blur.tooltip" );
+ target.unbind( "mouseleave.tooltip blur.tooltip keyup.tooltip" );
this._trigger( "close", event, { tooltip: tooltip } );
},