rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dist

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
dist/js/bootstrap.js
View file

@ -1098,6 +1098,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);
}
}
@ -1144,7 +1146,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;
@ -1159,7 +1161,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);