mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-09 07:06:36 +02:00
Code Issues Releases Wiki Activity

dist

Browse Source
This commit is contained in:
Mark Otto
2018-01-03 16:03:22 -08:00
parent 20765b5025
commit 34cd2038d2
19 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/dist/collapse.js vendored
View File

@@ -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);

2
js/dist/collapse.js.map vendored
View File

File diff suppressed because one or more lines are too long