From 4d96e69a55a7d5c964d672fe2cf8f89c057bcb57 Mon Sep 17 00:00:00 2001 From: fat Date: Sat, 8 Mar 2014 19:45:38 -0800 Subject: fixes #9836 --- js/collapse.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/collapse.js b/js/collapse.js index 6907dda3a..59e27f13d 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -56,7 +56,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.$element .removeClass('collapsing') .addClass('collapse in') @@ -95,7 +96,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.transitioning = 0 this.$element .trigger('hidden.bs.collapse') -- cgit v1.2.3