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/popover.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/src/popover.js') diff --git a/js/src/popover.js b/js/src/popover.js index ff697d85a..28cb511fc 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -1,5 +1,6 @@ import $ from 'jquery' import Tooltip from './tooltip' +import Util from './util' /** @@ -189,6 +190,6 @@ const Popover = (() => { return Popover -})($) +})(Util.jQuery) export default Popover -- 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/popover.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'js/src/popover.js') diff --git a/js/src/popover.js b/js/src/popover.js index 28cb511fc..4fb96a792 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -1,6 +1,5 @@ import $ from 'jquery' import Tooltip from './tooltip' -import Util from './util' /** @@ -10,7 +9,7 @@ import Util from './util' * -------------------------------------------------------------------------- */ -const Popover = (() => { +const Popover = (($) => { /** @@ -190,6 +189,6 @@ const Popover = (() => { return Popover -})(Util.jQuery) +})($) export default Popover -- cgit v1.2.3