Skip to content

B
bootstrap
Commit bce33bbb authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

if parent in collapse, only grab children

parent 630ff4ff
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
docs/assets/js/bootstrap-collapse.js
View file @ bce33bbb
......@@ -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 () {
......
js/bootstrap-collapse.js
View file @ bce33bbb
......@@ -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 () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment