diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2012-04-25 05:06:41 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-04-25 05:06:41 +0400 |
| commit | aaabe2a46c64e7d9ffd5735dba2db4f3cf9906f5 (patch) | |
| tree | 07316b209771d30a941adb0cb96d391413620336 /js | |
| parent | 66ac6e14db39e552510bc6f033c06f59e68c27eb (diff) | |
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)v2.0.3
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-collapse.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-collapse.js | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 4cd412c73a..d02f6fda4f 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -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) } diff --git a/js/tests/unit/bootstrap-collapse.js b/js/tests/unit/bootstrap-collapse.js index 8e52898b5d..fb66135db9 100644 --- a/js/tests/unit/bootstrap-collapse.js +++ b/js/tests/unit/bootstrap-collapse.js @@ -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') + }) + })
\ No newline at end of file |