From 57e045f0ab22b5d8541b2565c348ffe95f155215 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 21 Nov 2020 21:51:49 +0200 Subject: [PATCH] Backport #32224 Be consistent with Popper's name. --- js/src/dropdown.js | 6 +++--- js/src/tooltip.js | 2 +- js/tests/unit/dropdown.js | 12 ++++++------ js/tests/unit/tooltip.js | 8 ++++---- scss/_dropdown.scss | 2 +- site/content/docs/4.5/components/dropdowns.md | 18 +++++++++--------- site/content/docs/4.5/components/popovers.md | 10 +++++----- site/content/docs/4.5/components/tooltips.md | 10 +++++----- .../docs/4.5/getting-started/download.md | 4 ++-- .../docs/4.5/getting-started/introduction.md | 14 +++++++------- .../partials/home/masthead-followup.html | 4 ++-- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/js/src/dropdown.js b/js/src/dropdown.js index c2779f05fa..c270533966 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -143,14 +143,14 @@ class Dropdown { return } - // Disable totally Popper.js for Dropdown in Navbar + // Totally disable Popper for Dropdowns in Navbar if (!this._inNavbar && usePopper) { /** * Check for Popper dependency * Popper - https://popper.js.org */ if (typeof Popper === 'undefined') { - throw new TypeError('Bootstrap\'s dropdowns require Popper.js (https://popper.js.org/)') + throw new TypeError('Bootstrap\'s dropdowns require Popper (https://popper.js.org)') } let referenceElement = this._element @@ -334,7 +334,7 @@ class Dropdown { } } - // Disable Popper.js if we have a static display + // Disable Popper if we have a static display if (this._config.display === 'static') { popperConfig.modifiers.applyStyle = { enabled: false diff --git a/js/src/tooltip.js b/js/src/tooltip.js index a770340385..0b74eb800d 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -114,7 +114,7 @@ const TRIGGER_MANUAL = 'manual' class Tooltip { constructor(element, config) { if (typeof Popper === 'undefined') { - throw new TypeError('Bootstrap\'s tooltips require Popper.js (https://popper.js.org/)') + throw new TypeError('Bootstrap\'s tooltips require Popper (https://popper.js.org)') } // private diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index 62b7993339..e4b959ea18 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -747,7 +747,7 @@ $(function () { $dropdown.trigger('click') }) - QUnit.test('Dropdown should not use Popper.js in navbar', function (assert) { + QUnit.test('Dropdown should not use Popper in navbar', function (assert) { assert.expect(1) var done = assert.async() var html = '