diff options
| author | Jacob Thornton <[email protected]> | 2012-01-29 23:40:34 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-29 23:40:34 -0800 |
| commit | 734bfe7f78574477a264f5ed430dc266d29f38f4 (patch) | |
| tree | 70af8eededacd65e32c0d1c4dde780d812700dfb | |
| parent | 0de951f4f41c798dead8525e78153fc6c5da1479 (diff) | |
| parent | f9b53d424e55bca4c7efe6220d36acafaee613cd (diff) | |
| download | bootstrap-734bfe7f78574477a264f5ed430dc266d29f38f4.tar.xz bootstrap-734bfe7f78574477a264f5ed430dc266d29f38f4.zip | |
Merge pull request #1421 from MarkReeder/2.0-wip
Fixes Opera flickering on the collapse plugin when reset is called without specifying the size
| -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 ee36840d2..8134cc42f 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -71,7 +71,7 @@ this.$element .removeClass('collapse') - [dimension](size || '') + [dimension](size || 'auto') [0].offsetWidth this.$element.addClass('collapse') |