aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
Diffstat (limited to 'js/src')
-rw-r--r--js/src/collapse.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js
index eaad1be54..b0c17112c 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -83,6 +83,7 @@ const Collapse = (($) => {
const elem = tabToggles[i]
const selector = Util.getSelectorFromElement(elem)
if (selector !== null && $(selector).filter(element).length > 0) {
+ this._selector = selector
this._triggerArray.push(elem)
}
}
@@ -141,7 +142,7 @@ const Collapse = (($) => {
}
if (actives) {
- activesData = $(actives).data(DATA_KEY)
+ activesData = $(actives).not(this._selector).data(DATA_KEY)
if (activesData && activesData._isTransitioning) {
return
}
@@ -154,7 +155,7 @@ const Collapse = (($) => {
}
if (actives) {
- Collapse._jQueryInterface.call($(actives), 'hide')
+ Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide')
if (!activesData) {
$(actives).data(DATA_KEY, null)
}