aboutsummaryrefslogtreecommitdiff
path: root/js/collapse.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-08-23 12:58:24 -0700
committerMark Otto <[email protected]>2014-08-23 12:58:24 -0700
commit875006d08c2e7f48e458fee65327d6c83d4974b1 (patch)
treefd84621b0e842ffaab5d73ee4276b893c5cfd712 /js/collapse.js
parentf265137c0517266206055d306ed41e9456878652 (diff)
parent9c2e54bfeca744ca3d2ab811b23d9a083502c53d (diff)
downloadbootstrap-875006d08c2e7f48e458fee65327d6c83d4974b1.tar.xz
bootstrap-875006d08c2e7f48e458fee65327d6c83d4974b1.zip
Merge pull request #14417 from twbs/fat-14282
fixes #14282 - Already Visible collapse gets closed when …
Diffstat (limited to 'js/collapse.js')
-rw-r--r--js/collapse.js2
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]()
})