1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 20:31:26 +02:00
This commit is contained in:
Mark Otto
2018-01-03 16:03:22 -08:00
parent 20765b5025
commit 34cd2038d2
19 changed files with 61 additions and 35 deletions

View File

@@ -1097,6 +1097,8 @@ var Collapse = function ($$$1) {
var selector = Util.getSelectorFromElement(elem);
if (selector !== null && $$$1(selector).filter(element).length > 0) {
this._selector = selector;
this._triggerArray.push(elem);
}
}
@@ -1143,7 +1145,7 @@ var Collapse = function ($$$1) {
}
if (actives) {
activesData = $$$1(actives).data(DATA_KEY);
activesData = $$$1(actives).not(this._selector).data(DATA_KEY);
if (activesData && activesData._isTransitioning) {
return;
@@ -1158,7 +1160,7 @@ var Collapse = function ($$$1) {
}
if (actives) {
Collapse._jQueryInterface.call($$$1(actives), 'hide');
Collapse._jQueryInterface.call($$$1(actives).not(this._selector), 'hide');
if (!activesData) {
$$$1(actives).data(DATA_KEY, null);