diff options
| author | Thomas McDonald <tom@conceptcoding.co.uk> | 2012-04-26 01:35:34 +0400 |
|---|---|---|
| committer | Thomas McDonald <tom@conceptcoding.co.uk> | 2012-04-26 01:35:34 +0400 |
| commit | a72773a9e80936818a1b437d73f1213e4df21020 (patch) | |
| tree | 166647af85c268057a61ef18ca55643cb8d5bec0 | |
| parent | 375b76c684cd78cc1745c122d25601cf9b410596 (diff) | |
fix collapse regression
| -rw-r--r-- | vendor/assets/javascripts/bootstrap-collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/assets/javascripts/bootstrap-collapse.js b/vendor/assets/javascripts/bootstrap-collapse.js index 4cd412c7..d02f6fda 100644 --- a/vendor/assets/javascripts/bootstrap-collapse.js +++ b/vendor/assets/javascripts/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) } |