diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2016-10-20 14:25:00 -0400 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2016-10-20 14:25:00 -0400 |
| commit | 9ee304b973a5675a7a59406fdaeef20870f566ce (patch) | |
| tree | 8820ad86b8cd5899ea1d2c9050881b4ff56c8fee /js/src/collapse.js | |
| parent | 27cf3d675c80029ff2cea1e14903886c00119e37 (diff) | |
| parent | b5890e0608ad2262cde4a38e90afa19f1cb5d852 (diff) | |
| download | bootstrap-9ee304b973a5675a7a59406fdaeef20870f566ce.tar.xz bootstrap-9ee304b973a5675a7a59406fdaeef20870f566ce.zip | |
Merge branch 'twbs/v4-dev' into v4-dev
Diffstat (limited to 'js/src/collapse.js')
| -rw-r--r-- | js/src/collapse.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js index d99b384d1..1e2d4a63e 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): collapse.js + * Bootstrap (v4.0.0-alpha.5): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Collapse = (($) => { */ const NAME = 'collapse' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.5' const DATA_KEY = 'bs.collapse' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' @@ -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() |