aboutsummaryrefslogtreecommitdiff
path: root/js/dist/collapse.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2018-01-03 16:03:22 -0800
committerMark Otto <[email protected]>2018-01-03 16:03:22 -0800
commit34cd2038d2b16f305919e1fc36ff45913e3d1dfd (patch)
tree66a41962bb17521270363a29782ab23c19a32a7b /js/dist/collapse.js
parent20765b50258e6d28071ec5da26067294f2714d9e (diff)
downloadbootstrap-34cd2038d2b16f305919e1fc36ff45913e3d1dfd.tar.xz
bootstrap-34cd2038d2b16f305919e1fc36ff45913e3d1dfd.zip
dist
Diffstat (limited to 'js/dist/collapse.js')
-rw-r--r--js/dist/collapse.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/dist/collapse.js b/js/dist/collapse.js
index b87b31ce4..03093983e 100644
--- a/js/dist/collapse.js
+++ b/js/dist/collapse.js
@@ -74,6 +74,8 @@ var Collapse = function ($) {
var selector = Util.getSelectorFromElement(elem);
if (selector !== null && $(selector).filter(element).length > 0) {
+ this._selector = selector;
+
this._triggerArray.push(elem);
}
}
@@ -120,7 +122,7 @@ var Collapse = function ($) {
}
if (actives) {
- activesData = $(actives).data(DATA_KEY);
+ activesData = $(actives).not(this._selector).data(DATA_KEY);
if (activesData && activesData._isTransitioning) {
return;
@@ -135,7 +137,7 @@ var Collapse = function ($) {
}
if (actives) {
- Collapse._jQueryInterface.call($(actives), 'hide');
+ Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide');
if (!activesData) {
$(actives).data(DATA_KEY, null);