Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'js/dist/collapse.js')
-rw-r--r--js/dist/collapse.js16
1 files changed, 4 insertions, 12 deletions
diff --git a/js/dist/collapse.js b/js/dist/collapse.js
index d5105f4421..0e2bc75e21 100644
--- a/js/dist/collapse.js
+++ b/js/dist/collapse.js
@@ -58,9 +58,8 @@ var Collapse = function ($) {
};
var Selector = {
- ACTIVES: '.card > .show, .card > .collapsing',
- DATA_TOGGLE: '[data-toggle="collapse"]',
- DATA_CHILDREN: 'data-children'
+ ACTIVES: '.show, .collapsing',
+ DATA_TOGGLE: '[data-toggle="collapse"]'
};
/**
@@ -77,20 +76,13 @@ var Collapse = function ($) {
this._element = element;
this._config = this._getConfig(config);
this._triggerArray = $.makeArray($('[data-toggle="collapse"][href="#' + element.id + '"],' + ('[data-toggle="collapse"][data-target="#' + element.id + '"]')));
+
this._parent = this._config.parent ? this._getParent() : null;
if (!this._config.parent) {
this._addAriaAndCollapsedClass(this._element, this._triggerArray);
}
- this._selectorActives = Selector.ACTIVES;
- if (this._parent) {
- var childrenSelector = this._parent.hasAttribute(Selector.DATA_CHILDREN) ? this._parent.getAttribute(Selector.DATA_CHILDREN) : null;
- if (childrenSelector !== null) {
- this._selectorActives = childrenSelector + ' > .show, ' + childrenSelector + ' > .collapsing';
- }
- }
-
if (this._config.toggle) {
this.toggle();
}
@@ -119,7 +111,7 @@ var Collapse = function ($) {
var activesData = void 0;
if (this._parent) {
- actives = $.makeArray($(this._parent).find(this._selectorActives));
+ actives = $.makeArray($(this._parent).children().children(Selector.ACTIVES));
if (!actives.length) {
actives = null;
}