From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 20 Mar 2012 04:10:55 +0000 (-0700)
Subject: if parent in collapse, only grab children
X-Git-Tag: v2.0.3~5^2~108^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bce33bbb091e66a58418395188ea50be151f3f8e;p=thirdparty%2Fbootstrap.git

if parent in collapse, only grab children
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d9a2d0e30f..8564e3d964 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js
index 228d2a182b..2dbf7a7617 100644
--- a/docs/assets/js/bootstrap-collapse.js
+++ b/docs/assets/js/bootstrap-collapse.js
@@ -44,7 +44,7 @@
   , show: function () {
       var dimension = this.dimension()
         , scroll = $.camelCase(['scroll', dimension].join('-'))
-        , actives = this.$parent && this.$parent.find('.in')
+        , actives = this.$parent && this.$parent.find('> .accordion-group > .in')
         , hasData
 
       if (actives && actives.length) {
@@ -56,7 +56,6 @@
       this.$element[dimension](0)
       this.transition('addClass', 'show', 'shown')
       this.$element[dimension](this.$element[0][scroll])
-
     }
 
   , hide: function () {
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 228d2a182b..2dbf7a7617 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -44,7 +44,7 @@
   , show: function () {
       var dimension = this.dimension()
         , scroll = $.camelCase(['scroll', dimension].join('-'))
-        , actives = this.$parent && this.$parent.find('.in')
+        , actives = this.$parent && this.$parent.find('> .accordion-group > .in')
         , hasData
 
       if (actives && actives.length) {
@@ -56,7 +56,6 @@
       this.$element[dimension](0)
       this.transition('addClass', 'show', 'shown')
       this.$element[dimension](this.$element[0][scroll])
-
     }
 
   , hide: function () {