diff options
| -rw-r--r-- | js/src/collapse.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/collapse.js | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js index f4b89c37b..3fb0245e7 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -235,7 +235,7 @@ const Collapse = (($) => { .trigger(Event.HIDDEN) } - this._element.style[dimension] = 0 + this._element.style[dimension] = '' if (!Util.supportsTransitionEnd()) { complete() diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 4eadc205b..d387ebb18 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -90,6 +90,21 @@ $(function () { .bootstrapCollapse('show') }) + QUnit.test('should reset style to auto after finishing closing collapse', function (assert) { + assert.expect(1) + var done = assert.async() + + $('<div class="collapse"/>') + .on('shown.bs.collapse', function () { + $(this).bootstrapCollapse('hide') + }) + .on('hidden.bs.collapse', function () { + assert.strictEqual(this.style.height, '', 'height is auto') + done() + }) + .bootstrapCollapse('show') + }) + QUnit.test('should remove "collapsed" class from target when collapse is shown', function (assert) { assert.expect(1) var done = assert.async() |