Merge branch '2.2.3' into 2.3.0-wip

6b67a836 · fat · c00f29e4 · 2c9f43f6 · 6b67a836
Commit 6b67a836 authored Dec 20, 2012 by fat
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

js/bootstrap-collapse.js js/bootstrap-collapse.js +1 -1

No files found.
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -52,7 +52,7 @@
        , actives
        , hasData

-      if (this.transitioning) return
+      if (this.transitioning || this.$element.hasClass('in')) return

      dimension = this.dimension()
      scroll = $.camelCase(['scroll', dimension].join('-'))