diff options
| author | Mark Otto <[email protected]> | 2013-08-13 11:15:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 11:15:46 -0700 |
| commit | 9a3aa9f1defcdf5f7a1dc0bcb9dca0f0e2d675bf (patch) | |
| tree | be0a197e9c3f02b5af312aa77567d8e92cac0c98 /js/collapse.js | |
| parent | d482b712e750cb7bb17e8076fb06752e3627ac4a (diff) | |
| parent | 729854fa5f41ec15061dc33a49d279ae9def942e (diff) | |
| download | bootstrap-9a3aa9f1defcdf5f7a1dc0bcb9dca0f0e2d675bf.tar.xz bootstrap-9a3aa9f1defcdf5f7a1dc0bcb9dca0f0e2d675bf.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
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 b20022a2e..92cc0bc76 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -48,7 +48,7 @@ this.$element.trigger(startEvent) if (startEvent.isDefaultPrevented()) return - var actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var actives = this.$parent && this.$parent.find('> .panel > .in') if (actives && actives.length) { var hasData = actives.data('bs.collapse') |