aboutsummaryrefslogtreecommitdiff
path: root/js/collapse.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-13 10:44:43 -0700
committerMark Otto <[email protected]>2013-08-13 10:44:43 -0700
commit729854fa5f41ec15061dc33a49d279ae9def942e (patch)
tree041e9e0b12b2d8904ede82aebc668fa03898f522 /js/collapse.js
parent3e373a844c7763f513d1aec13fcd5da9d4bcd1e8 (diff)
parent33a88c9a94761a0371b0b3084de9009749033067 (diff)
downloadbootstrap-729854fa5f41ec15061dc33a49d279ae9def942e.tar.xz
bootstrap-729854fa5f41ec15061dc33a49d279ae9def942e.zip
Merge pull request #9404 from twbs/bs3_drop_accordion_for_panel
BS3: Drop the accordion for the panel (fixes #8648)
Diffstat (limited to 'js/collapse.js')
-rw-r--r--js/collapse.js2
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')