diff options
| author | Johann-S <[email protected]> | 2017-10-29 23:51:04 +0100 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-10-29 15:51:04 -0700 |
| commit | 2232b6b4d140cf8a01314deb7e4779c7fde8ab05 (patch) | |
| tree | 7c3d0ec4a290b48b5d7d541247a0e6203a988776 | |
| parent | e454c8ec1e5197d959baf48fb089719bf900fb2a (diff) | |
| download | bootstrap-2232b6b4d140cf8a01314deb7e4779c7fde8ab05.tar.xz bootstrap-2232b6b4d140cf8a01314deb7e4779c7fde8ab05.zip | |
Throw error about Popper.js only when it's needed because some of our plugins don't use it (#24573)
| -rw-r--r-- | js/src/dropdown.js | 16 | ||||
| -rw-r--r-- | js/src/tooltip.js | 16 |
2 files changed, 15 insertions, 17 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 45d061c93..a18f0c28a 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -13,14 +13,6 @@ import Util from './util' const Dropdown = (($) => { /** - * Check for Popper dependency - * Popper - https://popper.js.org - */ - if (typeof Popper === 'undefined') { - throw new Error('Bootstrap dropdown require Popper.js (https://popper.js.org)') - } - - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ @@ -151,6 +143,14 @@ const Dropdown = (($) => { return } + /** + * Check for Popper dependency + * Popper - https://popper.js.org + */ + if (typeof Popper === 'undefined') { + throw new Error('Bootstrap dropdown require Popper.js (https://popper.js.org)') + } + let element = this._element // for dropup with alignment we use the parent as popper container if ($(parent).hasClass(ClassName.DROPUP)) { diff --git a/js/src/tooltip.js b/js/src/tooltip.js index a3fc93c91..7cefd0be6 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -13,15 +13,6 @@ import Util from './util' const Tooltip = (($) => { /** - * Check for Popper dependency - * Popper - https://popper.js.org - */ - if (typeof Popper === 'undefined') { - throw new Error('Bootstrap tooltips require Popper.js (https://popper.js.org)') - } - - - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ @@ -120,6 +111,13 @@ const Tooltip = (($) => { class Tooltip { constructor(element, config) { + /** + * Check for Popper dependency + * Popper - https://popper.js.org + */ + if (typeof Popper === 'undefined') { + throw new Error('Bootstrap tooltips require Popper.js (https://popper.js.org)') + } // private this._isEnabled = true |