diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
| commit | 689e75e4b1b8055e657b30eb692b34ebf9d549da (patch) | |
| tree | 711f3f78d34a69f34ee40fa24a7e8fc4f961ae00 /js/collapse.js | |
| parent | b886fd2f012f3ebe68292aaedf55d5c3709f972b (diff) | |
| parent | b1721f42cc8298fb691530614ee6d52389872e25 (diff) | |
| download | bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.tar.xz bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.zip | |
Merge branch 'master' into text-emphasis-variant
Diffstat (limited to 'js/collapse.js')
| -rw-r--r-- | js/collapse.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/collapse.js b/js/collapse.js index 1857cba16..004beaa69 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -127,6 +127,7 @@ var data = $this.data('bs.collapse') var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + if (!data && options.toggle && option == 'show') option = !option if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) |