1 files changed, 32 insertions, 6 deletions

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 47a377bfd..1892d6555 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -14,6 +14,31 @@
 
 var increments = 0;
 
+function addDescribedBy( elem, id ) {
+	var describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ );
+	describedby.push( id );
+	elem
+		.data( "ui-tooltip-id", id )
+		.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
+}
+
+function removeDescribedBy( elem ) {
+	var id = elem.data( "ui-tooltip-id" ),
+		describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ ),
+		index = $.inArray( id, describedby );
+	if ( index !== -1 ) {
+		describedby.splice( index, 1 );
+	}
+
+	elem.removeData( "ui-tooltip-id" );
+	describedby = $.trim( describedby.join( " " ) );
+	if ( describedby ) {
+		elem.attr( "aria-describedby", describedby );
+	} else {
+		elem.removeAttr( "aria-describedby" );
+	}
+}
+
 $.widget( "ui.tooltip", {
 	version: "@VERSION",
 	options: {
@@ -92,8 +117,8 @@ $.widget( "ui.tooltip", {
 			target = $( event ? event.target : this.element )
 				.closest( this.options.items );
 
-		// if aria-describedby exists, then the tooltip is already open
-		if ( !target.length || target.attr( "aria-describedby" ) ) {
+		// if ui-tooltip-id exists, then the tooltip is already open
+		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
 			return;
 		}
 
@@ -127,7 +152,7 @@ $.widget( "ui.tooltip", {
 		// if we have a title, clear it to prevent the native 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 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).
@@ -143,7 +168,7 @@ $.widget( "ui.tooltip", {
 		var tooltip = this._find( target );
 		if ( !tooltip.length ) {
 			tooltip = this._tooltip( target );
-			target.attr( "aria-describedby", tooltip.attr( "id" ) );
+			addDescribedBy( target, tooltip.attr( "id" ) );
 		}
 		tooltip.find( ".ui-tooltip-content" ).html( content );
 		tooltip
@@ -183,6 +208,7 @@ $.widget( "ui.tooltip", {
 
 		// don't close if the element has focus
 		// this prevents the tooltip from closing if you hover while focused
+		//
 		// 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" &&
@@ -195,7 +221,7 @@ $.widget( "ui.tooltip", {
 			target.attr( "title", target.data( "ui-tooltip-title" ) );
 		}
 
-		target.removeAttr( "aria-describedby" );
+		removeDescribedBy( target );
 
 		tooltip.stop( true );
 		this._hide( tooltip, this.options.hide, function() {
@@ -232,7 +258,7 @@ $.widget( "ui.tooltip", {
 	},
 
 	_find: function( target ) {
-		var id = target.attr( "aria-describedby" );
+		var id = target.data( "ui-tooltip-id" );
 		return id ? $( "#" + id ) : $();
 	},