From 436015c191f8f1b01176f7ea330d4d3d2b80e4ce Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Fri, 8 Aug 2014 01:23:50 +0200 Subject: [PATCH] Collapse: count `.collapsing` elements as actives; closes #13447 --- js/collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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')