From 1487c3a9947b0eb55c61b5d93ff9f0c69a812aeb Mon Sep 17 00:00:00 2001 From: Johann-S Date: Mon, 23 Oct 2017 09:35:27 +0200 Subject: Add `Util.jQuery` which will detect jQuery instead of relying on global `$` (#24513) --- 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 8e84d7b59..9a21eb7d8 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -404,6 +404,6 @@ const Collapse = (() => { return Collapse -})($) +})(Util.jQuery) export default Collapse -- cgit v1.2.3 From 62fbb23ee61999e362cd8ade6073732a46466077 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 24 Oct 2017 10:12:45 +0200 Subject: Change Rollup config to wrap our dist files with jQuery instead of $ --- js/src/collapse.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/collapse.js') diff --git a/js/src/collapse.js b/js/src/collapse.js index 9a21eb7d8..f907aec54 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -9,7 +9,7 @@ import Util from './util' * -------------------------------------------------------------------------- */ -const Collapse = (() => { +const Collapse = (($) => { /** @@ -404,6 +404,6 @@ const Collapse = (() => { return Collapse -})(Util.jQuery) +})($) export default Collapse -- cgit v1.2.3