mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Code Activity

Merge pull request #13306 from twbs/fat-11099

Browse Source 
fixes #11099 - $.collapse() overrides the original dimension of the coll...
This commit is contained in:
Jacob
2014-04-20 12:12:17 -07:00
parent 4f427cbe32 cd4696f723
commit b02d3c7eff
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/collapse.js
+1 -1
View File
@@ -63,7 +63,7 @@
}
this.$element
.removeClass('collapsing')
.addClass('collapse in')[dimension]('auto')
.addClass('collapse in')[dimension]('')
this.transitioning = 0
this.$element.trigger('shown.bs.collapse')
}
js/tests/unit/collapse.js
+2 -2
View File
@@ -19,7 +19,7 @@ $(function () {
test('should show a collapsed element', function () {
var el = $('<div class="collapse"></div>').collapse('show')
ok(el.hasClass('in'), 'has class in')
ok(/height/.test(el.attr('style')), 'has height set')
ok(!/height/.test(el.attr('style')), 'has height reset')
})
test('should hide a collapsed element', function () {
@@ -51,7 +51,7 @@ $(function () {
ok(this.style.height == '0px')
})
.on('shown.bs.collapse', function () {
ok(this.style.height == 'auto')
ok(this.style.height === '')
start()
})
.collapse('show')