diff options
| author | Jacob Thornton <[email protected]> | 2012-04-24 18:06:41 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-24 18:06:41 -0700 |
| commit | aaabe2a46c64e7d9ffd5735dba2db4f3cf9906f5 (patch) | |
| tree | 07316b209771d30a941adb0cb96d391413620336 /js/bootstrap-collapse.js | |
| parent | 66ac6e14db39e552510bc6f033c06f59e68c27eb (diff) | |
| download | bootstrap-aaabe2a46c64e7d9ffd5735dba2db4f3cf9906f5.tar.xz bootstrap-aaabe2a46c64e7d9ffd5735dba2db4f3cf9906f5.zip | |
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)v2.0.3
Diffstat (limited to 'js/bootstrap-collapse.js')
| -rw-r--r-- | js/bootstrap-collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 4cd412c73..d02f6fda4 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) } |