diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-05-31 18:43:42 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-05-31 18:43:42 +0200 |
| commit | 749c8fbb6673a15c6477b43d6a6a4f7101f85a5b (patch) | |
| tree | e10cd0ba0124f646d568e1dea5aa177d14f949cc /ui/jquery.ui.dialog.js | |
| parent | 8abe1d015f5b8d1aa68ccc9dd1ad4744b0216938 (diff) | |
| parent | e0fe788ee0c0c0d8d23f9d90b9acff713ba1302f (diff) | |
| download | jquery-ui-749c8fbb6673a15c6477b43d6a6a4f7101f85a5b.tar.gz jquery-ui-749c8fbb6673a15c6477b43d6a6a4f7101f85a5b.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.dialog.js')
| -rw-r--r-- | ui/jquery.ui.dialog.js | 12 |
1 files changed, 6 insertions, 6 deletions
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 = $( "<div>" ) ) .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 = $( "<span>" ) + .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 ); |