diff options
| author | fat <[email protected]> | 2012-12-20 01:05:55 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2012-12-20 01:05:55 -0800 |
| commit | 6b67a836316adad78f0cc0e7244af0f0ddddf0b7 (patch) | |
| tree | e8d75be50dc7815417b30d6258ff0eda078c4f3f | |
| parent | c00f29e4d4e157376c2b24a64bee67bc67e7136a (diff) | |
| parent | 2c9f43f6858597b3bbc6d4036a3bd1dd18d6181f (diff) | |
| download | bootstrap-6b67a836316adad78f0cc0e7244af0f0ddddf0b7.tar.xz bootstrap-6b67a836316adad78f0cc0e7244af0f0ddddf0b7.zip | |
Merge branch '2.2.3' into 2.3.0-wip
| -rw-r--r-- | js/bootstrap-collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 9e7211218..6755aa7e2 100644 --- 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('-')) |