diff options
author | Chris Rebert <github@rebertia.com> | 2015-03-09 11:03:27 +0300 |
---|---|---|
committer | Chris Rebert <github@rebertia.com> | 2015-03-09 11:03:27 +0300 |
commit | 21d56378e1f7ec1cd24ffefcad32357267930c74 (patch) | |
tree | 63473c845f0121d5520115e17ed829eedcff4b65 /js | |
parent | 2c56b0feb0e2385169deb3f1683bd34a2927d535 (diff) | |
parent | 5c8d56d515da49b2051743fa0bacba79967778c2 (diff) |
Merge pull request #16011 from twbs/fix-15315
.collapse('hide') on hidden uninit-ed collapsible no longer shows it
Diffstat (limited to 'js')
-rw-r--r-- | js/collapse.js | 2 | ||||
-rw-r--r-- | js/tests/unit/collapse.js | 35 |
2 files changed, 32 insertions, 5 deletions
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..8c01e57e86 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -41,11 +41,10 @@ $(function () { }) QUnit.test('should hide a collapsed element', function (assert) { - assert.expect(2) + assert.expect(1) var $el = $('<div class="collapse"/>').bootstrapCollapse('hide') 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) { @@ -147,7 +146,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 +161,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 +176,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() |