1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 21:56:42 +02:00

fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)

This commit is contained in:
Jacob Thornton
2012-04-24 18:06:41 -07:00
parent 66ac6e14db
commit aaabe2a46c
6 changed files with 22 additions and 8 deletions

View File

@@ -95,7 +95,7 @@
, transition: function (method, startEvent, completeEvent) {
var that = this
, complete = function () {
if (startEvent == 'show') that.reset()
if (startEvent.type == 'show') that.reset()
that.transitioning = 0
that.$element.trigger(completeEvent)
}

View File

@@ -37,4 +37,18 @@ $(function () {
.collapse('show')
})
test("should reset style to auto after finishing opening collapse", function () {
$.support.transition = false
stop();
$('<div class="collapse" style="height: 0px"/>')
.bind('show', function () {
ok(this.style.height == '0px')
})
.bind('shown', function () {
ok(this.style.height == 'auto')
start()
})
.collapse('show')
})
})