From aaabe2a46c64e7d9ffd5735dba2db4f3cf9906f5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Apr 2012 18:06:41 -0700 Subject: fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) --- js/bootstrap-collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/bootstrap-collapse.js') 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) } -- cgit v1.2.3