]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fixes #13157 - Collapse plugin - issues with transition end event bubbling 13176/head
authorfat <jacobthornton@gmail.com>
Tue, 25 Mar 2014 04:25:16 +0000 (21:25 -0700)
committerChris Rebert <code@rebertia.com>
Tue, 22 Apr 2014 00:35:29 +0000 (17:35 -0700)
js/collapse.js

index 266f3580d92eb975b5274ec4bfe12bc620c45497..49abbe51552b6dd62102ad288f9e7031f7265dfa 100644 (file)
@@ -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])
   }