Skip to content

Commit

Permalink
.collapse('hide') on hidden uninit-ed collapsible no longer shows it; f…
Browse files Browse the repository at this point in the history
…ixes #15315

Thanks to @peterblazejewicz & @Nikita240
Adds unit tests based on #14417
X-Ref: #14282
Closes #15807
  • Loading branch information
cvrebert committed Mar 6, 2015
1 parent 01aa0d8 commit 872e56f
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
2 changes: 1 addition & 1 deletion js/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
var data = $this.data('bs.collapse')
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 (typeof option == 'string') data[option]()
})
Expand Down
32 changes: 30 additions & 2 deletions js/tests/unit/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ $(function () {
$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)
var done = assert.async()

Expand All @@ -162,7 +162,7 @@ $(function () {
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)
var done = assert.async()

Expand All @@ -177,6 +177,34 @@ $(function () {
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) {
assert.expect(3)
var done = assert.async()
Expand Down

0 comments on commit 872e56f

Please sign in to comment.