fixes #13157 - Collapse plugin - issues with transition end event bub…

…bling
twbs · Mar 25, 2014 · ac904f7 · ac904f7
1 parent acf5707
commit ac904f7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/collapse.js b/js/collapse.js
@@ -63,15 +63,17 @@
         .addClass('collapse in')
         [dimension]('auto')
       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])
   }