aboutsummaryrefslogtreecommitdiff
path: root/js/src
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2017-08-25 10:14:18 +0200
committerJohann-S <[email protected]>2017-08-25 09:48:35 +0100
commit5a90b4aa3e102e387839a39fbf0ab1444eebbc76 (patch)
tree7211cb13d94aa3d94cfa610d8cc66226a0e67452 /js/src
parent4571ab0e57a5d2ff251b8c174ab0f693c5892dce (diff)
downloadbootstrap-5a90b4aa3e102e387839a39fbf0ab1444eebbc76.tar.xz
bootstrap-5a90b4aa3e102e387839a39fbf0ab1444eebbc76.zip
Collapse - preventDefault only on <a> elements not inside the collapsible
element
Diffstat (limited to 'js/src')
-rw-r--r--js/src/collapse.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js
index 718630bd3..7d1ba4c54 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -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()
}