diff options
| author | Mark Otto <otto@github.com> | 2012-12-26 19:21:34 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-12-26 19:21:34 +0400 |
| commit | 9749d6afc2730d41cab0111e1cc19bba7c5c3676 (patch) | |
| tree | 5420af50b680ac608d6ed177d24d79870dcad544 /js/bootstrap-collapse.js | |
| parent | f74990d898b08be61f0f8b514378adf223d55a4b (diff) | |
| parent | b9c7f29134f2fa81931fa4663fc40ef7a0e363d1 (diff) | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Diffstat (limited to 'js/bootstrap-collapse.js')
| -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 9f0a3f622d..20b2eb90a8 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -129,7 +129,7 @@ return this.each(function () { var $this = $(this) , data = $this.data('collapse') - , options = typeof option == 'object' && option + , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) if (!data) $this.data('collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) |