From: fat <jacobthornton@gmail.com>
Date: Tue, 25 Mar 2014 04:25:16 +0000 (-0700)
Subject: fixes #13157 - Collapse plugin - issues with transition end event bubbling
X-Git-Tag: v3.2.0~226^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ae07d84a79b1a138e3e6068b0cdbdce9041e58;p=thirdparty%2Fbootstrap.git

fixes #13157 - Collapse plugin - issues with transition end event bubbling
---

diff --git a/js/collapse.js b/js/collapse.js
index 266f3580d9..49abbe5155 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -65,7 +65,9 @@
         .removeClass('collapsing')
         .addClass('collapse in')[dimension]('')
       this.transitioning = 0
-      this.$element.trigger('shown.bs.collapse')
+      this.$element
+        .off($.support.transition.end + '.bs.collapse')
+        .trigger('shown.bs.collapse')
     }
 
     if (!$.support.transition) return complete.call(this)
@@ -73,7 +75,7 @@
     var scrollSize = $.camelCase(['scroll', dimension].join('-'))
 
     this.$element
-      .one($.support.transition.end, $.proxy(complete, this))
+      .on($.support.transition.end + '.bs.collapse', $.proxy(complete, this))
       .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize])
   }