From 42099e44610face58172ed0ed27115fb2b84ab50 Mon Sep 17 00:00:00 2001 From: Daniel Owens Date: Wed, 8 May 2013 12:15:44 -0500 Subject: Tooltip: Accept HTMLElement and jQuery objects for the content option Fixes #9278 Closes #983 Closes #1421 --- ui/tooltip.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'ui') diff --git a/ui/tooltip.js b/ui/tooltip.js index 7ea1d13ee..85c64f2a0 100644 --- a/ui/tooltip.js +++ b/ui/tooltip.js @@ -208,7 +208,8 @@ return $.widget( "ui.tooltip", { that = this, eventType = event ? event.type : null; - if ( typeof contentOption === "string" ) { + if ( typeof contentOption === "string" || contentOption.nodeType || + contentOption.jquery ) { return this._open( event, target, contentOption ); } @@ -276,13 +277,9 @@ return $.widget( "ui.tooltip", { // JAWS announces deletions even when aria-relevant="additions" // Voiceover will sometimes re-read the entire log region's contents from the beginning this.liveRegion.children().hide(); - if ( content.clone ) { - a11yContent = content.clone(); - a11yContent.removeAttr( "id" ).find( "[id]" ).removeAttr( "id" ); - } else { - a11yContent = content; - } - $( "
" ).html( a11yContent ).appendTo( this.liveRegion ); + a11yContent = $( "
" ).html( tooltip.find( ".ui-tooltip-content" ).html() ); + a11yContent.removeAttr( "id" ).find( "[id]" ).removeAttr( "id" ); + a11yContent.appendTo( this.liveRegion ); function position( event ) { positionOption.of = event; -- cgit v1.2.3