diff options
| author | Heinrich Fenkart <[email protected]> | 2014-08-08 01:23:50 +0200 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-08-08 01:23:50 +0200 |
| commit | 436015c191f8f1b01176f7ea330d4d3d2b80e4ce (patch) | |
| tree | 7e3e408612d6b2edf5037b24c685ee2689292b31 | |
| parent | b4895a0d6dc493f17fe9092db4debe44182d42ac (diff) | |
| download | bootstrap-436015c191f8f1b01176f7ea330d4d3d2b80e4ce.tar.xz bootstrap-436015c191f8f1b01176f7ea330d4d3d2b80e4ce.zip | |
Collapse: count `.collapsing` elements as actives; closes #13447
| -rw-r--r-- | js/collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/collapse.js b/js/collapse.js index a265344f4..6ffdb3347 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') |