From: Heinrich Fenkart <hnrch02@gmail.com>
Date: Thu, 7 Aug 2014 23:23:50 +0000 (+0200)
Subject: Collapse: count `.collapsing` elements as actives; closes #13447
X-Git-Tag: v3.3.0~175^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=436015c191f8f1b01176f7ea330d4d3d2b80e4ce;p=thirdparty%2Fbootstrap.git

Collapse: count `.collapsing` elements as actives; closes #13447
---

diff --git a/js/collapse.js b/js/collapse.js
index a265344f40..6ffdb33476 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -42,7 +42,7 @@
     this.$element.trigger(startEvent)
     if (startEvent.isDefaultPrevented()) return
 
-    var actives = this.$parent && this.$parent.find('> .panel > .in')
+    var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing')
 
     if (actives && actives.length) {
       var hasData = actives.data('bs.collapse')