diff options
| author | Johann-S <[email protected]> | 2017-09-25 12:41:54 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2017-09-25 13:23:13 +0200 |
| commit | 9b8356ba52d89fd065d6061979b5946b8c5f44fa (patch) | |
| tree | 3c78f94c599eb0ba9d052742abb8e8fe5d926fba /js/src/collapse.js | |
| parent | 3abf8a0e5525d30914ce37ebb98240a476cb6f17 (diff) | |
| download | bootstrap-9b8356ba52d89fd065d6061979b5946b8c5f44fa.tar.xz bootstrap-9b8356ba52d89fd065d6061979b5946b8c5f44fa.zip | |
Collapse - Allow to pass jQuery object or DOM element to the parent option
Diffstat (limited to 'js/src/collapse.js')
| -rw-r--r-- | js/src/collapse.js | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js index bf9c990ec..fa082f133 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -33,7 +33,7 @@ const Collapse = (() => { const DefaultType = { toggle : 'boolean', - parent : 'string' + parent : '(string|element)' } const Event = { @@ -289,7 +289,18 @@ const Collapse = (() => { } _getParent() { - const parent = $(this._config.parent)[0] + let parent = null + if (Util.isElement(this._config.parent)) { + parent = this._config.parent + + // it's a jQuery object + if (typeof this._config.parent.jquery !== 'undefined') { + parent = this._config.parent[0] + } + } else { + parent = $(this._config.parent)[0] + } + const selector = `[data-toggle="collapse"][data-parent="${this._config.parent}"]` |