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/dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src/dropdown.js') diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 8fdddd689..48f87c5aa 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -445,6 +445,6 @@ const Dropdown = (() => { return Dropdown -})($, Popper) +})(Util.jQuery, Popper) export default Dropdown -- 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/dropdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/dropdown.js') diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 48f87c5aa..e3331ac18 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -10,7 +10,7 @@ import Util from './util' * -------------------------------------------------------------------------- */ -const Dropdown = (() => { +const Dropdown = (($) => { /** * Check for Popper dependency @@ -445,6 +445,6 @@ const Dropdown = (() => { return Dropdown -})(Util.jQuery, Popper) +})($, Popper) export default Dropdown -- cgit v1.2.3