diff options
Diffstat (limited to 'js/dist/collapse.js')
-rw-r--r-- | js/dist/collapse.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/dist/collapse.js b/js/dist/collapse.js index b87b31ce4c..03093983e3 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); |