From 240b22b1439df22408c5782e640e98cb335c7a2e Mon Sep 17 00:00:00 2001 From: kborchers Date: Tue, 29 May 2012 23:11:42 -0500 Subject: Dialog: Use new uniqueId method for generating id's --- ui/jquery.ui.dialog.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ui/jquery.ui.dialog.js') diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index e48c26400..4ef8a20cb 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -87,7 +87,6 @@ $.widget("ui.dialog", { options = this.options, title = options.title || " ", - titleId = $.ui.dialog.getTitleId( this.element ), uiDialog = ( this.uiDialog = $( "
" ) ) .addClass( uiDialogClasses + options.dialogClass ) @@ -105,10 +104,6 @@ $.widget("ui.dialog", { event.preventDefault(); } }) - .attr({ - role: "dialog", - "aria-labelledby": titleId - }) .mousedown(function( event ) { that.moveToTop( false, event ); }) @@ -140,8 +135,8 @@ $.widget("ui.dialog", { .appendTo( uiDialogTitlebarClose ), uiDialogTitle = $( "" ) + .uniqueId() .addClass( "ui-dialog-title" ) - .attr( "id", titleId ) .html( title ) .prependTo( uiDialogTitlebar ), @@ -152,6 +147,11 @@ $.widget("ui.dialog", { .addClass( "ui-dialog-buttonset" ) .appendTo( uiDialogButtonPane ); + uiDialog.attr({ + role: "dialog", + "aria-labelledby": uiDialogTitle.attr( "id" ) + }); + uiDialogTitlebar.find( "*" ).add( uiDialogTitlebar ).disableSelection(); this._hoverable( uiDialogTitlebarClose ); this._focusable( uiDialogTitlebarClose ); -- cgit v1.2.3