diff options
| author | Gijs Boddeus <[email protected]> | 2017-08-25 23:29:40 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-25 23:29:40 +0200 |
| commit | 4356d08abb4d94785af15f3cc9be0e553f1c1c03 (patch) | |
| tree | ce649fd410b7e9a38758ef8318e1d9aba5eef3e8 /js/src/collapse.js | |
| parent | a103958975787653b4ba84f80d1d1e8f7be302c3 (diff) | |
| parent | ba6a6f13691000ffaf22ef8e731513737659447f (diff) | |
| download | bootstrap-4356d08abb4d94785af15f3cc9be0e553f1c1c03.tar.xz bootstrap-4356d08abb4d94785af15f3cc9be0e553f1c1c03.zip | |
Merge pull request #3 from twbs/v4-dev
update from official repo
Diffstat (limited to 'js/src/collapse.js')
| -rw-r--r-- | js/src/collapse.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js index 2f00b98cb..7d1ba4c54 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -343,7 +343,7 @@ const Collapse = (($) => { } if (typeof config === 'string') { - if (data[config] === undefined) { + if (typeof data[config] === 'undefined') { throw new Error(`No method named "${config}"`) } data[config]() @@ -361,7 +361,8 @@ const Collapse = (($) => { */ $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { - if (!/input|textarea/i.test(event.target.tagName)) { + // preventDefault only for <a> elements (which change the URL) not inside the collapsible element + if (event.target.tagName === 'A' && !$.contains(this, event.target)) { event.preventDefault() } |