From 45276521778c9843c3d308f7fcda4168a75f4825 Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Fri, 8 Sep 2017 14:53:15 -0700 Subject: [PATCH 01/45] Collapse.js preventDefault if `[data-toggle="collapse"]` is an anchor tag --- js/src/collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/collapse.js b/js/src/collapse.js index acc959d40c83..bf9c990ecc94 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -363,7 +363,7 @@ const Collapse = (() => { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { // preventDefault only for elements (which change the URL) not inside the collapsible element - if (event.target.tagName === 'A' && !$.contains(this, event.target)) { + if (event.currentTarget.tagName === 'A') { event.preventDefault() } From 7add90db9c71766c2be81252791a4ae281d0be6d Mon Sep 17 00:00:00 2001 From: Herst Date: Mon, 11 Sep 2017 15:40:54 +0200 Subject: [PATCH 02/45] Remove hyperlink from navbar doc dropdown (#23650) --- docs/4.0/components/navbar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4.0/components/navbar.md b/docs/4.0/components/navbar.md index 3e47dc7e8eae..fb5cc2c64902 100644 --- a/docs/4.0/components/navbar.md +++ b/docs/4.0/components/navbar.md @@ -165,7 +165,7 @@ You may also utilize dropdowns in your navbar nav. Dropdown menus require a wrap Pricing