diff options
| author | Mark Otto <[email protected]> | 2014-08-23 13:31:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-23 13:31:56 -0700 |
| commit | f36e1c467c6d3080179de69a15641e9725ce636e (patch) | |
| tree | 1d30f3580c1fa3e03473df92ddcc1add7242b2b7 /js/collapse.js | |
| parent | 9a39ee90b4fd4d5b9b6f9a6f2c9d5a29ffeafe92 (diff) | |
| parent | e3c26407827794df917f6d2d0f378cb5bf7f39e8 (diff) | |
| download | bootstrap-f36e1c467c6d3080179de69a15641e9725ce636e.tar.xz bootstrap-f36e1c467c6d3080179de69a15641e9725ce636e.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'js/collapse.js')
| -rw-r--r-- | js/collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/collapse.js b/js/collapse.js index a265344f4..db89804cb 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -124,7 +124,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 && options.toggle && option == 'show') options.toggle = false if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) |