Merge pull request #13176 from twbs/fat-13157

fixes #13157 - Collapse plugin - issues with transition end event bubbli...
twbs · Apr 25, 2014 · 022dc30 · 022dc30
2 parents fe11ac7 + b9ae07d
commit 022dc30
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/collapse.js b/js/collapse.js
@@ -65,15 +65,17 @@
         .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)
 
     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])
   }