grunt dist

06fb9406 · Mark Otto · d08f7dd8 · 06fb9406 · 06fb9406 · 06fb9406
Commit 06fb9406 authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 12 additions and 4 deletions
+12 -4
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -516,7 +516,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
    this.transitioning = 1
    var complete = function (e) {
-      if (e && e.target != this.$element[0]) return
+      if (e && e.target != this.$element[0]) {
+        this.$element
+          .one($.support.transition.end, $.proxy(complete, this))
+        return
+      }
      this.$element
        .removeClass('collapsing')
        .addClass('collapse in')[dimension]('auto')
@@ -552,7 +556,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
    this.transitioning = 1
    var complete = function (e) {
-      if (e && e.target != this.$element[0]) return
+      if (e && e.target != this.$element[0]) {
+        this.$element
+          .one($.support.transition.end, $.proxy(complete, this))
+        return
+      }
      this.transitioning = 0
      this.$element
        .trigger('hidden.bs.collapse')

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs/dist/js/bootstrap.min.js
+++ b/docs/dist/js/bootstrap.min.js