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

Merge pull request #16011 from twbs/fix-15315

Browse Source 
.collapse('hide') on hidden uninit-ed collapsible no longer shows it
This commit is contained in:
Chris Rebert 2015-03-09 01:03:27 -07:00
commit 21d56378e1
2 changed files with 32 additions and 5 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]()
}) })

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

@ -41,11 +41,10 @@ $(function () {
}) })
QUnit.test('should hide a collapsed element', function (assert) { QUnit.test('should hide a collapsed element', function (assert) {
assert.expect(2) assert.expect(1)
var $el = $('<div class="collapse"/>').bootstrapCollapse('hide') var $el = $('<div class="collapse"/>').bootstrapCollapse('hide')
assert.ok(!$el.hasClass('in'), 'does not have class "in"') assert.ok(!$el.hasClass('in'), 'does not have class "in"')
assert.ok(/height/i.test($el.attr('style')), 'has height set')
}) })
QUnit.test('should not fire shown when show is prevented', function (assert) { QUnit.test('should not fire shown when show is prevented', function (assert) {
@ -147,7 +146,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 +161,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 +176,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()