diff options
| author | Jacob Thornton <[email protected]> | 2012-03-19 21:10:55 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-19 21:10:55 -0700 |
| commit | bce33bbb091e66a58418395188ea50be151f3f8e (patch) | |
| tree | aea741c01241efaa7ce32a7f312e40f4d62da892 | |
| parent | 630ff4ff7dca4d51474b8b4168e48e60fc858e0c (diff) | |
| download | bootstrap-bce33bbb091e66a58418395188ea50be151f3f8e.tar.xz bootstrap-bce33bbb091e66a58418395188ea50be151f3f8e.zip | |
if parent in collapse, only grab children
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55837 -> 55867 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-collapse.js | 3 | ||||
| -rw-r--r-- | js/bootstrap-collapse.js | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex d9a2d0e30..8564e3d96 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 228d2a182..2dbf7a761 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 228d2a182..2dbf7a761 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 () { |