diff options
author | Mark Otto <markdotto@gmail.com> | 2018-01-04 03:03:22 +0300 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2018-01-04 03:03:22 +0300 |
commit | 34cd2038d2b16f305919e1fc36ff45913e3d1dfd (patch) | |
tree | 66a41962bb17521270363a29782ab23c19a32a7b /dist/js/bootstrap.js | |
parent | 20765b50258e6d28071ec5da26067294f2714d9e (diff) |
dist
Diffstat (limited to 'dist/js/bootstrap.js')
-rw-r--r-- | dist/js/bootstrap.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index dd3645a137..a41c4073c5 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -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); |