From bce33bbb091e66a58418395188ea50be151f3f8e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 21:10:55 -0700 Subject: if parent in collapse, only grab children --- js/bootstrap-collapse.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js') 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 () { -- cgit v1.2.3