rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-04-06 23:57:36 +02:00
Code Issues Actions 11 Packages Releases Activity

if parent in collapse, only grab children

Browse Source
This commit is contained in:
Jacob Thornton 2012-03-19 21:10:55 -07:00
parent 630ff4ff7d
commit bce33bbb09
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

3
docs/assets/js/bootstrap-collapse.js vendored
View File

@ -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 @@
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 () {

3
js/bootstrap-collapse.js vendored
View File

@ -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 @@
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 () {