Merge branch 'master' into selectmenu

1 files changed, 12 insertions, 7 deletions

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 97895a6a8..47a377bfd 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -5,8 +5,6 @@
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
- * http://docs.jquery.com/UI/Tooltip
- *
  * Depends:
  *	jquery.ui.core.js
  *	jquery.ui.widget.js
@@ -130,11 +128,15 @@ $.widget( "ui.tooltip", {
 		// we have to check first to avoid defining a title if none exists
 		// (we don't want to cause an element to start matching [title])
 
-		// We don't use removeAttr as that causes the native tooltip to show
-		// up in IE (9 and below, didn't yet test 10). Happens only when removing
-		// inside the mouseover handler.
+		// We use removeAttr only for key events, to allow IE to export the correct
+		// accessible attributes. For mouse events, set to empty string to avoid
+		// native tooltip showing up (happens only when removing inside mouseover).
 		if ( target.is( "[title]" ) ) {
-			target.attr( "title", "" );
+			if ( event && event.type === "mouseover" ) {
+				target.attr( "title", "" );
+			} else {
+				target.removeAttr( "title" );
+			}
 		}
 
 		// ajaxy tooltip can update an existing one
@@ -181,7 +183,10 @@ $.widget( "ui.tooltip", {
 
 		// don't close if the element has focus
 		// this prevents the tooltip from closing if you hover while focused
-		if ( !force && this.document[0].activeElement === target[0] ) {
+		// we have to check the event type because tabbing out of the document
+		// may leave the element as the activeElement
+		if ( !force && event && event.type !== "focusout" &&
+				this.document[0].activeElement === target[0] ) {
 			return;
 		}