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

…bling
twbs · Apr 9, 2014 · bcd153d · bcd153d
1 parent 488c6b4
commit bcd153d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
@@ -523,15 +523,17 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
         .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])
   }

diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
diff --git a/docs/assets/js/customize.min.js b/docs/assets/js/customize.min.js
diff --git a/docs/assets/js/raw-files.min.js b/docs/assets/js/raw-files.min.js
diff --git a/docs/dist/js/bootstrap.min.js b/docs/dist/js/bootstrap.min.js
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])
   }

diff --git a/test-infra/npm-shrinkwrap.canonical.json b/test-infra/npm-shrinkwrap.canonical.json