diff --git a/js/collapse.js b/js/collapse.js index 834f4f6b81..0394165198 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -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]() }) diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 68c4bce253..40f586c2ec 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -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() @@ -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() @@ -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() + + $('
') + .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() + + $('') + .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()