diff options
| -rw-r--r-- | js/src/collapse.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/collapse.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js index dc2e2a67d..88428310d 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -357,7 +357,7 @@ const Collapse = (($) => { */ $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { - if (/input|textarea/i.test(event.target.tagName)) { + if (!/input|textarea/i.test(event.target.tagName)) { event.preventDefault() } diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 01bc5adb9..e7083f56d 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -515,13 +515,14 @@ $(function () { }) QUnit.test('should not prevent event for input', function (assert) { - assert.expect(2) + assert.expect(3) var done = assert.async() var $target = $('<input type="checkbox" data-toggle="collapse" data-target="#collapsediv1" />').appendTo('#qunit-fixture') $('<div id="collapsediv1"/>') .appendTo('#qunit-fixture') .on('shown.bs.collapse', function () { + assert.ok($(this).hasClass('show')) assert.ok($target.attr('aria-expanded') === 'true') assert.ok($target.prop('checked')) done() |