Skip to content
GitLab
Commit bce33bbb authored by Jacob Thornton's avatar Jacob Thornton
Browse files

if parent in collapse, only grab children

parent 630ff4ff
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4 deletions
+2 -4
docs/assets/bootstrap.zip
+ 0
- 0
View file @ bce33bbb
No preview for this file type
docs/assets/js/bootstrap-collapse.js
+ 1
- 2
View file @ bce33bbb
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
, show: function () { , show: function () {
var dimension = this.dimension() var dimension = this.dimension()
, scroll = $.camelCase(['scroll', dimension].join('-')) , scroll = $.camelCase(['scroll', dimension].join('-'))
, actives = this.$parent && this.$parent.find('.in') , actives = this.$parent && this.$parent.find('> .accordion-group > .in')
, hasData , hasData
if (actives && actives.length) { if (actives && actives.length) {
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
this.$element[dimension](0) this.$element[dimension](0)
this.transition('addClass', 'show', 'shown') this.transition('addClass', 'show', 'shown')
this.$element[dimension](this.$element[0][scroll]) this.$element[dimension](this.$element[0][scroll])
} }
, hide: function () { , hide: function () {
......
js/bootstrap-collapse.js
+ 1
- 2
View file @ bce33bbb
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
, show: function () { , show: function () {
var dimension = this.dimension() var dimension = this.dimension()
, scroll = $.camelCase(['scroll', dimension].join('-')) , scroll = $.camelCase(['scroll', dimension].join('-'))
, actives = this.$parent && this.$parent.find('.in') , actives = this.$parent && this.$parent.find('> .accordion-group > .in')
, hasData , hasData
if (actives && actives.length) { if (actives && actives.length) {
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
this.$element[dimension](0) this.$element[dimension](0)
this.transition('addClass', 'show', 'shown') this.transition('addClass', 'show', 'shown')
this.$element[dimension](this.$element[0][scroll]) this.$element[dimension](this.$element[0][scroll])
} }
, hide: function () { , hide: function () {
......
Supports Markdown
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