diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-07-25 11:53:14 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-07-25 11:53:14 -0400 |
| commit | 19a9de7e668cdb3b76c3b733d0147f1853cb38a5 (patch) | |
| tree | a259b421dd77cbec27e55db9b4d1104bf5214a2a /ui/jquery.ui.tooltip.js | |
| parent | daadc343be2f139e82719e2e5ff466aa19ec166f (diff) | |
| parent | 51ee3be39829e339c8e4bccb532347944e600ca5 (diff) | |
| download | jquery-ui-19a9de7e668cdb3b76c3b733d0147f1853cb38a5.tar.gz jquery-ui-19a9de7e668cdb3b76c3b733d0147f1853cb38a5.zip | |
Merge branch 'master' into core-1.6.1
Conflicts:
demos/menubar/default.html
tests/unit/autocomplete/autocomplete.html
tests/visual/effects/effects.all.html
ui/jquery.ui.menu.js
ui/jquery.ui.popup.js
Diffstat (limited to 'ui/jquery.ui.tooltip.js')
| -rw-r--r-- | ui/jquery.ui.tooltip.js | 11 |
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 } ); }, |