From 34cd2038d2b16f305919e1fc36ff45913e3d1dfd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 3 Jan 2018 16:03:22 -0800 Subject: dist --- dist/js/bootstrap.bundle.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist/js/bootstrap.bundle.js') diff --git a/dist/js/bootstrap.bundle.js b/dist/js/bootstrap.bundle.js index 5d6dc742c..8668a4ea3 100644 --- a/dist/js/bootstrap.bundle.js +++ b/dist/js/bootstrap.bundle.js @@ -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); -- cgit v1.2.3