mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
if parent in collapse, only grab children
This commit is contained in:
parent
630ff4ff7d
commit
bce33bbb09
Binary file not shown.
3
docs/assets/js/bootstrap-collapse.js
vendored
3
docs/assets/js/bootstrap-collapse.js
vendored
@ -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 () {
|
||||
|
3
js/bootstrap-collapse.js
vendored
3
js/bootstrap-collapse.js
vendored
@ -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 () {
|
||||
|
Loading…
Reference in New Issue
Block a user