From 9936bf59444c402b653f28449529eab83794e911 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Tue, 29 Aug 2017 21:16:00 +0200
Subject: Create a bundled release of Bootstrap with Popper.js inside

---
 js/src/collapse.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/src/collapse.js')

diff --git a/js/src/collapse.js b/js/src/collapse.js
index 7d1ba4c54..acc959d40 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -1,3 +1,4 @@
+import $ from 'jquery'
 import Util from './util'
 
 
@@ -8,7 +9,7 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Collapse = (($) => {
+const Collapse = (() => {
 
 
   /**
-- 
cgit v1.2.3


From 45276521778c9843c3d308f7fcda4168a75f4825 Mon Sep 17 00:00:00 2001
From: Patrick Yeo <patrick.yeo@liferay.com>
Date: Fri, 8 Sep 2017 14:53:15 -0700
Subject: Collapse.js preventDefault if `[data-toggle="collapse"]` is an anchor
 tag

---
 js/src/collapse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/src/collapse.js')

diff --git a/js/src/collapse.js b/js/src/collapse.js
index acc959d40..bf9c990ec 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 <a> 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()
     }
 
-- 
cgit v1.2.3