diff options
| author | Heinrich Fenkart <[email protected]> | 2014-09-13 02:28:25 +0200 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-09-13 02:28:25 +0200 |
| commit | 40f889df2a07c4ae9953387fef15d7033e31c434 (patch) | |
| tree | 2de4310ba9b28f632defa514c34595ec0ea5eaf9 /js/collapse.js | |
| parent | 60164bc4ba33b4b8132629ebaf781b72266a7979 (diff) | |
| parent | 436015c191f8f1b01176f7ea330d4d3d2b80e4ce (diff) | |
| download | bootstrap-40f889df2a07c4ae9953387fef15d7033e31c434.tar.xz bootstrap-40f889df2a07c4ae9953387fef15d7033e31c434.zip | |
Merge pull request #14353 from hnrch02/collapse-count-collapsing-as-active
Collapse: count `.collapsing` elements as actives; closes #13447
Diffstat (limited to 'js/collapse.js')
| -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 6a8377615..d7d56bdd5 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') |