Merge pull request #13330 from Kronuz/patch-1

Wait for the expected target during a collapse

Merge pull request #13330 from Kronuz/patch-1
Wait for the expected target during a collapse
d08f7dd8 · Chris Rebert · 1254c322 · 82b066f0 · d08f7dd8
Commit d08f7dd8 authored 10 years ago by Chris Rebert
Hide whitespace changes
Inline Side-by-side

Showing

with 10 additions and 2 deletions
+10 -2
--- 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')