r1045 - in trunk: tests ui
Author: scott.gonzalez
Date: Sat Dec 6 06:58:52 2008
New Revision: 1045
Modified:
trunk/tests/dialog.js
trunk/ui/ui.dialog.js
Log:
Dialog: Fixed #3637: Added role of button to close link.
Modified: trunk/tests/dialog.js
==============================================================================
--- trunk/tests/dialog.js (original)
+++ trunk/tests/dialog.js Sat Dec 6 06:58:52 2008
@@ -215,6 +215,24 @@
el.remove();
});
+test("ARIA", function() {
+ expect(4);
+
+ el = $('<div></div>').dialog();
+
+ equals(dlg().attr('role'), 'dialog', 'dialog role');
+
+ var labelledBy = dlg().attr('aria-labelledby');
+ ok(labelledBy.length > 0, 'has aria-labelledby attribute');
+ equals(dlg().find('.ui-dialog-title').attr('id'), labelledBy,
+ 'proper aria-labelledby attribute');
+
+ equals(dlg().find('.ui-dialog-titlebar-close').attr('role'), 'button',
+ 'close link role');
+
+ el.remove();
+});
+
module("dialog: Options");
test("autoOpen", function() {
Modified: trunk/ui/ui.dialog.js
==============================================================================
--- trunk/ui/ui.dialog.js (original)
+++ trunk/ui/ui.dialog.js Sat Dec 6 06:58:52 2008
@@ -52,11 +52,19 @@
uiDialogTitlebar = (this.uiDialogTitlebar = $('<div/>'))
.addClass('ui-dialog-titlebar')
- .append('<a href="#"
class="ui-dialog-titlebar-close"><span>X</span></a>')
.mousedown(function() {
self.moveToTop();
})
.prependTo(uiDialogContainer),
+
+ uiDialogTitlebarClose = $('<a href="#"/>')
+ .addClass('ui-dialog-titlebar-close')
+ .attr('role', 'button')
+ .appendTo(uiDialogTitlebar),
+
+ uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText =
$('<span/>'))
+ .html('X')
+ .appendTo(uiDialogTitlebarClose),
title = options.title || ' ',
titleId = $.ui.dialog.getTitleId(this.element),