Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <jacobthornton@gmail.com>2012-03-20 08:10:55 +0400
committerJacob Thornton <jacobthornton@gmail.com>2012-03-20 08:10:55 +0400
commitbce33bbb091e66a58418395188ea50be151f3f8e (patch)
treeaea741c01241efaa7ce32a7f312e40f4d62da892 /js/bootstrap-collapse.js
parent630ff4ff7dca4d51474b8b4168e48e60fc858e0c (diff)
if parent in collapse, only grab children
Diffstat (limited to 'js/bootstrap-collapse.js')
-rw-r--r--js/bootstrap-collapse.js3
1 files changed, 1 insertions, 2 deletions
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 () {