rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

Collapse - Fix check to not prevent event for input and textarea

Browse Source
This commit is contained in:
Johann-S 2017-03-29 00:10:27 +02:00 committed by GitHub
parent 48c5efa4c3
commit fb42d6e043
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/collapse.js
View File

@ -357,7 +357,7 @@ const Collapse = (($) => {
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(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() event.preventDefault()
} }

3
js/tests/unit/collapse.js
View File

@ -515,13 +515,14 @@ $(function () {
}) })
QUnit.test('should not prevent event for input', function (assert) { QUnit.test('should not prevent event for input', function (assert) {
assert.expect(2) assert.expect(3)
var done = assert.async() var done = assert.async()
var $target = $('<input type="checkbox" data-toggle="collapse" data-target="#collapsediv1" />').appendTo('#qunit-fixture') var $target = $('<input type="checkbox" data-toggle="collapse" data-target="#collapsediv1" />').appendTo('#qunit-fixture')
$('<div id="collapsediv1"/>') $('<div id="collapsediv1"/>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.on('shown.bs.collapse', function () { .on('shown.bs.collapse', function () {
assert.ok($(this).hasClass('show'))
assert.ok($target.attr('aria-expanded') === 'true') assert.ok($target.attr('aria-expanded') === 'true')
assert.ok($target.prop('checked')) assert.ok($target.prop('checked'))
done() done()