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/button.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index 9227da951..87e724346 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,4 +1,6 @@ import $ from 'jquery' +import Util from './util' + /** * -------------------------------------------------------------------------- * Bootstrap (v4.0.0-beta.2): button.js @@ -182,6 +184,6 @@ const Button = (() => { return Button -})($) +})(Util.jQuery) export default Button -- 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/button.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index 87e724346..5632998a3 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,5 +1,4 @@ import $ from 'jquery' -import Util from './util' /** * -------------------------------------------------------------------------- @@ -8,7 +7,7 @@ import Util from './util' * -------------------------------------------------------------------------- */ -const Button = (() => { +const Button = (($) => { /** @@ -184,6 +183,6 @@ const Button = (() => { return Button -})(Util.jQuery) +})($) export default Button -- cgit v1.2.3