aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2013-07-31 22:57:00 -0700
committerJacob Thornton <[email protected]>2013-07-31 22:57:00 -0700
commit7a3c61ee33b8a07de20b2d30ed2bcd5fd7649fd6 (patch)
treee99829295c0b14cf1331ef7f6fbb11245298e284
parentccd4c9d7b5f90cbbef7f2c9d6b9b3dec615185fc (diff)
downloadbootstrap-7a3c61ee33b8a07de20b2d30ed2bcd5fd7649fd6.tar.xz
bootstrap-7a3c61ee33b8a07de20b2d30ed2bcd5fd7649fd6.zip
fixes #8892
-rw-r--r--javascript.html2
-rw-r--r--js/collapse.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/javascript.html b/javascript.html
index 845a6e9ec..17dc81392 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1480,7 +1480,7 @@ $(".collapse").collapse()
<td>parent</td>
<td>selector</td>
<td>false</td>
- <td>If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior)</td>
+ <td>If selector then all collapsible elements under the specified parent will be closed when this collapsible item is shown. (similar to traditional accordion behavior - this dependent on the <code>accordion-group</code> class)</td>
</tr>
<tr>
<td>toggle</td>
diff --git a/js/collapse.js b/js/collapse.js
index 34ac3c7fa..ab575515d 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('> .accordion-group > .in')
if (actives && actives.length) {
var hasData = actives.data('bs.collapse')