Merge pull request #13330 from Kronuz/patch-1

Wait for the expected target during a collapse
twbs · Apr 16, 2014 · d08f7dd · d08f7dd
2 parents 1254c32 + 82b066f
commit d08f7dd
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/js/collapse.js b/js/collapse.js
@@ -56,7 +56,11 @@
     this.transitioning = 1
 
     var complete = function (e) {
-      if (e && e.target != this.$element[0]) return
+      if (e && e.target != this.$element[0]) {
+        this.$element
+          .one($.support.transition.end, $.proxy(complete, this))
+        return
+      }
       this.$element
         .removeClass('collapsing')
         .addClass('collapse in')[dimension]('auto')
@@ -92,7 +96,11 @@
     this.transitioning = 1
 
     var complete = function (e) {
-      if (e && e.target != this.$element[0]) return
+      if (e && e.target != this.$element[0]) {
+        this.$element
+          .one($.support.transition.end, $.proxy(complete, this))
+        return
+      }
       this.transitioning = 0
       this.$element
         .trigger('hidden.bs.collapse')