Commit 9c2e54bf authored by fat's avatar fat
Browse files

fixes #14282 - Already Visible collapse gets closed when .collapse('show') is called

parent ea0e1606
Showing with 33 additions and 1 deletion
+33 -1
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
var data = $this.data('bs.collapse') var data = $this.data('bs.collapse')
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) 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 (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
......
...@@ -102,6 +102,38 @@ $(function () { ...@@ -102,6 +102,38 @@ $(function () {
$target.click() $target.click()
}) })
test('should not close a collapse when initialized with "show" if already shown', function () {
stop()
expect(0)
var $test = $('<div id="test1" class="in"/>')
.appendTo('#qunit-fixture')
.on('hide.bs.collapse', function () {
ok(false)
})
$test.bootstrapCollapse('show')
setTimeout(start, 0)
})
test('should open a collapse when initialized with "show" if not already shown', function () {
stop()
expect(1)
var $test = $('<div id="test1" />')
.appendTo('#qunit-fixture')
.on('show.bs.collapse', function () {
ok(true)
})
$test.bootstrapCollapse('show')
setTimeout(start, 0)
})
test('should remove "collapsed" class from active accordion target', function () { test('should remove "collapsed" class from active accordion target', function () {
stop() stop()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment