]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Collapse: count `.collapsing` elements as actives; closes #13447 14353/head
authorHeinrich Fenkart <hnrch02@gmail.com>
Thu, 7 Aug 2014 23:23:50 +0000 (01:23 +0200)
committerHeinrich Fenkart <hnrch02@gmail.com>
Thu, 7 Aug 2014 23:23:50 +0000 (01:23 +0200)
js/collapse.js

index a265344f4093a2a444e5d0512f755cec071f8f70..6ffdb334766b589f3ae0d6336c92f73a96b87392 100644 (file)
@@ -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')