From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 3 Jun 2012 04:26:34 +0000 (-0700)
Subject: only set height explicitly for collapse when animation is supported #2131
X-Git-Tag: v2.1.0~2^2~336
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91a7274a43836484cdf27e34c45856e4b715f778;p=thirdparty%2Fbootstrap.git

only set height explicitly for collapse when animation is supported #2131
---

diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index da64a3238a..45eea2906e 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -67,7 +67,7 @@
 
       this.$element[dimension](0)
       this.transition('addClass', $.Event('show'), 'shown')
-      this.$element[dimension](this.$element[0][scroll])
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
     }
 
   , hide: function () {