diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/modal.js | 5 | ||||
| -rw-r--r-- | js/tests/unit/modal.js | 28 | ||||
| -rw-r--r-- | js/tests/visual/modal.html | 2 |
3 files changed, 2 insertions, 33 deletions
diff --git a/js/modal.js b/js/modal.js index b031becfd..0426561af 100644 --- a/js/modal.js +++ b/js/modal.js @@ -90,9 +90,7 @@ that.$element[0].offsetWidth // force reflow } - that.$element - .addClass('in') - .attr('aria-hidden', false) + that.$element.addClass('in') that.enforceFocus() @@ -126,7 +124,6 @@ this.$element .removeClass('in') - .attr('aria-hidden', true) .off('click.dismiss.bs.modal') .off('mouseup.dismiss.bs.modal') diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index c6e747a3c..3c51c2fe2 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -49,18 +49,6 @@ $(function () { .bootstrapModal('show') }) - QUnit.test('should set aria-hidden to false when show method is called', function (assert) { - assert.expect(1) - var done = assert.async() - - $('<div id="modal-test"/>') - .on('shown.bs.modal', function () { - assert.strictEqual($('#modal-test').attr('aria-hidden'), 'false', 'aria-hidden is set to string "false" when modal shown') - done() - }) - .bootstrapModal('show') - }) - QUnit.test('should fire show event', function (assert) { assert.expect(1) var done = assert.async() @@ -106,22 +94,6 @@ $(function () { .bootstrapModal('show') }) - QUnit.test('should set aria-hidden to true when hide is called', function (assert) { - assert.expect(2) - var done = assert.async() - - $('<div id="modal-test"/>') - .on('shown.bs.modal', function () { - assert.strictEqual($('#modal-test').length, 1, 'modal has been inserted into the dom') - $(this).bootstrapModal('hide') - }) - .on('hidden.bs.modal', function () { - assert.strictEqual($('#modal-test').attr('aria-hidden'), 'true', 'aria-hidden is set to string "true" when modal shown') - done() - }) - .bootstrapModal('show') - }) - QUnit.test('should toggle when toggle is called', function (assert) { assert.expect(3) var done = assert.async() diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html index fb6dca059..4342f0ce4 100644 --- a/js/tests/visual/modal.html +++ b/js/tests/visual/modal.html @@ -54,7 +54,7 @@ <h1>Modal <small>Bootstrap Visual Test</small></h1> </div> - <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal-dialog"> <div class="modal-content"> |