diff options
| author | Gijs Boddeus <[email protected]> | 2017-10-04 11:03:20 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-04 11:03:20 +0200 |
| commit | 3d5b1c004ac0d6e3758164e5bbba9f493579f3d3 (patch) | |
| tree | 6bafbfa7d36d4ed458c4147b254f8fd6161932a6 /js | |
| parent | df6a8f7d813a5327f999ebcbed7c7015ad4dd80a (diff) | |
| parent | 1207048319c3efb635131a9c8bb1149aee51cad3 (diff) | |
| download | bootstrap-3d5b1c004ac0d6e3758164e5bbba9f493579f3d3.tar.xz bootstrap-3d5b1c004ac0d6e3758164e5bbba9f493579f3d3.zip | |
Merge branch 'v4-dev' into yiq-function-update
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/alert.js | 2 | ||||
| -rw-r--r-- | js/src/button.js | 2 | ||||
| -rw-r--r-- | js/src/carousel.js | 2 | ||||
| -rw-r--r-- | js/src/collapse.js | 2 | ||||
| -rw-r--r-- | js/src/dropdown.js | 2 | ||||
| -rw-r--r-- | js/src/index.js | 4 | ||||
| -rw-r--r-- | js/src/modal.js | 2 | ||||
| -rw-r--r-- | js/src/popover.js | 2 | ||||
| -rw-r--r-- | js/src/scrollspy.js | 2 | ||||
| -rw-r--r-- | js/src/tab.js | 2 | ||||
| -rw-r--r-- | js/src/tooltip.js | 2 | ||||
| -rw-r--r-- | js/src/util.js | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/js/src/alert.js b/js/src/alert.js index 9fcf088b1..9d6c498b9 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -189,6 +189,6 @@ const Alert = (() => { return Alert -})(jQuery) +})($) export default Alert diff --git a/js/src/button.js b/js/src/button.js index a121b8e13..7bf5e87dd 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -182,6 +182,6 @@ const Button = (() => { return Button -})(jQuery) +})($) export default Button diff --git a/js/src/carousel.js b/js/src/carousel.js index a5ad02541..3a6d7a4bc 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -519,6 +519,6 @@ const Carousel = (() => { return Carousel -})(jQuery) +})($) export default Carousel diff --git a/js/src/collapse.js b/js/src/collapse.js index fa082f133..d29e48722 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -404,6 +404,6 @@ const Collapse = (() => { return Collapse -})(jQuery) +})($) export default Collapse diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 6681df668..3a910996b 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -445,6 +445,6 @@ const Dropdown = (() => { return Dropdown -})(jQuery, Popper) +})($, Popper) export default Dropdown diff --git a/js/src/index.js b/js/src/index.js index 84a27880e..2629e507f 100644 --- a/js/src/index.js +++ b/js/src/index.js @@ -19,7 +19,7 @@ import Util from './util' */ (() => { - if (typeof jQuery === 'undefined') { + if (typeof $ === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.') } @@ -29,7 +29,7 @@ import Util from './util' if (version[0] < min || version[0] >= max) { throw new Error('Bootstrap\'s JavaScript requires at least jQuery v3.0.0 but less than v4.0.0') } -})(jQuery) +})($) export { Util, diff --git a/js/src/modal.js b/js/src/modal.js index 689e93bc1..fb787208d 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -585,6 +585,6 @@ const Modal = (() => { return Modal -})(jQuery) +})($) export default Modal diff --git a/js/src/popover.js b/js/src/popover.js index aeccdf750..89c78f4fe 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -189,6 +189,6 @@ const Popover = (() => { return Popover -})(jQuery) +})($) export default Popover diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index e8f0d3101..c844bd530 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -335,6 +335,6 @@ const ScrollSpy = (() => { return ScrollSpy -})(jQuery) +})($) export default ScrollSpy diff --git a/js/src/tab.js b/js/src/tab.js index 2a554c287..17699dfbe 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -282,6 +282,6 @@ const Tab = (() => { return Tab -})(jQuery) +})($) export default Tab diff --git a/js/src/tooltip.js b/js/src/tooltip.js index ca7e52b14..8d262f4ad 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -728,6 +728,6 @@ const Tooltip = (() => { return Tooltip -})(jQuery, Popper) +})($, Popper) export default Tooltip diff --git a/js/src/util.js b/js/src/util.js index 7eb25de55..a75660014 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -161,6 +161,6 @@ const Util = (() => { return Util -})(jQuery) +})($) export default Util |