From 9c2e54bfeca744ca3d2ab811b23d9a083502c53d Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Mon, 18 Aug 2014 19:58:19 -0700
Subject: fixes #14282 - Already Visible collapse gets closed when
 .collapse('show') is called

---
 js/collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/collapse.js')

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]()
     })
-- 
cgit v1.2.3