Skip to content

Commit

Permalink
Collapse: count .collapsing elements as actives; closes twbs#13447
Browse files Browse the repository at this point in the history
  • Loading branch information
hnrch02 committed Aug 7, 2014
1 parent b4895a0 commit 436015c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion js/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 436015c

Please sign in to comment.