aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-06-02 21:26:34 -0700
committerJacob Thornton <[email protected]>2012-06-02 21:26:34 -0700
commit91a7274a43836484cdf27e34c45856e4b715f778 (patch)
treedbe5a96e683ecb9763831ce0b35039ce33e89819
parenta38bc90b482c086e805aa2e942b56cd1429d5766 (diff)
downloadbootstrap-91a7274a43836484cdf27e34c45856e4b715f778.tar.xz
bootstrap-91a7274a43836484cdf27e34c45856e4b715f778.zip
only set height explicitly for collapse when animation is supported #2131
-rw-r--r--js/bootstrap-collapse.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index da64a3238..45eea2906 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 () {