rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

.collapse('hide') on hidden uninit-ed collapsible no longer shows it; fixes #15315

Browse Source 
Thanks to @peterblazejewicz & @Nikita240
Adds unit tests based on #14417
X-Ref: #14282
Closes #15807
This commit is contained in:
Chris Rebert 2015-03-06 03:05:30 -08:00
parent 01aa0d840a
commit 872e56fcf2
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/collapse.js
View File

@ -172,7 +172,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') options.toggle = false if (!data && options.toggle && /show|hide/.test(option)) 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]()
}) })

32
js/tests/unit/collapse.js
View File

@ -147,7 +147,7 @@ $(function () {
$target.click() $target.click()
}) })
QUnit.test('should not close a collapse when initialized with "show" if already shown', function (assert) { QUnit.test('should not close a collapse when initialized with "show" option if already shown', function (assert) {
assert.expect(0) assert.expect(0)
var done = assert.async() var done = assert.async()
@ -162,7 +162,7 @@ $(function () {
setTimeout(done, 0) setTimeout(done, 0)
}) })
QUnit.test('should open a collapse when initialized with "show" if not already shown', function (assert) { QUnit.test('should open a collapse when initialized with "show" option if not already shown', function (assert) {
assert.expect(1) assert.expect(1)
var done = assert.async() var done = assert.async()
@ -177,6 +177,34 @@ $(function () {
setTimeout(done, 0) setTimeout(done, 0)
}) })
QUnit.test('should not show a collapse when initialized with "hide" option if already hidden', function (assert) {
assert.expect(0)
var done = assert.async()
$('<div class="collapse"></div>')
.appendTo('#qunit-fixture')
.on('show.bs.collapse', function () {
assert.ok(false, 'showing a previously-uninitialized hidden collapse when the "hide" method is called')
})
.bootstrapCollapse('hide')
setTimeout(done, 0)
})
QUnit.test('should hide a collapse when initialized with "hide" option if not already hidden', function (assert) {
assert.expect(1)
var done = assert.async()
$('<div class="collapse in"></div>')
.appendTo('#qunit-fixture')
.on('hide.bs.collapse', function () {
assert.ok(true, 'hiding a previously-uninitialized shown collapse when the "hide" method is called')
})
.bootstrapCollapse('hide')
setTimeout(done, 0)
})
QUnit.test('should remove "collapsed" class from active accordion target', function (assert) { QUnit.test('should remove "collapsed" class from active accordion target', function (assert) {
assert.expect(3) assert.expect(3)
var done = assert.async() var done = assert.async()