Skip to content

Commit

Permalink
Add aria-modal to modals
Browse files Browse the repository at this point in the history
- dynamically set/remove `aria-modal="true"` when a modal is shown/hidden
- add relevant unit test
  • Loading branch information
patrickhlauke committed Dec 5, 2018
1 parent 8fb6e84 commit de3c75b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
2 changes: 2 additions & 0 deletions js/src/modal.js
Expand Up @@ -243,6 +243,7 @@ class Modal {

this._element.style.display = 'block'
this._element.removeAttribute('aria-hidden')
this._element.setAttribute('aria-modal', true)
this._element.scrollTop = 0

if (transition) {
Expand Down Expand Up @@ -314,6 +315,7 @@ class Modal {
_hideModal() {
this._element.style.display = 'none'
this._element.setAttribute('aria-hidden', true)
this._element.removeAttribute('aria-modal')
this._isTransitioning = false
this._showBackdrop(() => {
$(document.body).removeClass(ClassName.OPEN)
Expand Down
17 changes: 17 additions & 0 deletions js/tests/unit/modal.js
Expand Up @@ -280,6 +280,23 @@ $(function () {
.bootstrapModal('show')
})

QUnit.test('should add aria-modal attribute when shown, remove it again when hidden', function (assert) {
assert.expect(3)
var done = assert.async()

$('<div id="modal-test"/>')
.on('shown.bs.modal', function () {
assert.ok($('#modal-test').is('[aria-modal]'), 'aria-modal attribute added')
assert.strictEqual($('#modal-test').attr('aria-modal'), 'true', 'correct aria-modal="true" added')
$(this).bootstrapModal('hide')
})
.on('hidden.bs.modal', function () {
assert.notOk($('#modal-test').is('[aria-modal]'), 'aria-modal attribute removed')
done()
})
.bootstrapModal('show')
})

QUnit.test('should close reopened modal with [data-dismiss="modal"] click', function (assert) {
assert.expect(2)
var done = assert.async()
Expand Down

0 comments on commit de3c75b

Please sign in to comment.