diff options
| author | Mark Otto <[email protected]> | 2016-10-24 14:27:52 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-24 14:27:52 -0700 |
| commit | f7f3e62c662c88d578cf83e8245853d447b2aad9 (patch) | |
| tree | bff6a0e3c05c3ff54dbc7507aa107022a5ca8772 /js/src/collapse.js | |
| parent | 11d52ba9498990483d822a5a42d371393a110080 (diff) | |
| parent | cf5d94f6d5685c371dcb157af74a3c6b14ec8d8e (diff) | |
| download | bootstrap-f7f3e62c662c88d578cf83e8245853d447b2aad9.tar.xz bootstrap-f7f3e62c662c88d578cf83e8245853d447b2aad9.zip | |
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'js/src/collapse.js')
| -rw-r--r-- | js/src/collapse.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js index f4b89c37b..560ab2cbd 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -56,7 +56,7 @@ const Collapse = (($) => { } const Selector = { - ACTIVES : '.panel > .in, .panel > .collapsing', + ACTIVES : '.card > .in, .card > .collapsing', DATA_TOGGLE : '[data-toggle="collapse"]' } @@ -235,7 +235,7 @@ const Collapse = (($) => { .trigger(Event.HIDDEN) } - this._element.style[dimension] = 0 + this._element.style[dimension] = '' if (!Util.supportsTransitionEnd()) { complete() |