diff options
| author | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
| commit | 312ee6cdfb20f7602924c90e6ae37cba62a39da4 (patch) | |
| tree | 1931bb96def7cc20931b6f763fcd934abaeddeb8 /js/bootstrap-collapse.js | |
| parent | b12b71bf7ca76437a532122d8efff59506b61530 (diff) | |
| parent | cee2f61898f4807311402fed747a93ee68a31f8f (diff) | |
| download | bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.tar.xz bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'js/bootstrap-collapse.js')
| -rw-r--r-- | js/bootstrap-collapse.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 93f91513e..f56f6c705 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -34,7 +34,9 @@ Collapse.prototype = { - dimension: function () { + constructor: Collapse + + , dimension: function () { var hasWidth = this.$element.hasClass('width') return hasWidth ? 'width' : 'height' } |