if parent in collapse, only grab children

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d9a2d0e30f0660724e68352942d8f78d46e2f66b..8564e3d964c909895470ba6ad4327168f967d2bb 100644 (file)
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 228d2a182b909d6ba20e886be0d66998fbb4fe04..2dbf7a7617d8161cc632f2f50f0fe1cc3b1bd321 100644 (file)
--- 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 228d2a182b909d6ba20e886be0d66998fbb4fe04..2dbf7a7617d8161cc632f2f50f0fe1cc3b1bd321 100644 (file)
--- 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 () {