From: Jacob <jacobthornton@gmail.com>
Date: Sun, 20 Apr 2014 19:12:17 +0000 (-0700)
Subject: Merge pull request #13306 from twbs/fat-11099
X-Git-Tag: v3.2.0~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b02d3c7effdaa4ca8ecf79b3cf6cc71d6efcc533;p=thirdparty%2Fbootstrap.git

Merge pull request #13306 from twbs/fat-11099

fixes #11099 - $.collapse() overrides the original dimension of the coll...
---

b02d3c7effdaa4ca8ecf79b3cf6cc71d6efcc533
diff --cc js/collapse.js
index 42563c08e7,235b1a9e61..266f3580d9
--- a/js/collapse.js
+++ b/js/collapse.js
@@@ -56,14 -56,10 +56,14 @@@
      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')
+         .addClass('collapse in')[dimension]('')
        this.transitioning = 0
        this.$element.trigger('shown.bs.collapse')
      }