From fb42d6e0435bb101c0505090055e8034cb101dc4 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Wed, 29 Mar 2017 00:10:27 +0200
Subject: [PATCH] Collapse - Fix check to not prevent event for input and
 textarea

---
 js/src/collapse.js        | 2 +-
 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 dc2e2a67d7..88428310d3 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 01bc5adb96..e7083f56dd 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()
-- 
2.47.2