Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v4: Clarify JS bundle docs #32106

Merged
merged 2 commits into from Nov 10, 2020
Merged

v4: Clarify JS bundle docs #32106

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75d5c53
Clarify JS bundle docs once more for v4
mdo Nov 9, 2020
5d01d28
Merge branch 'v4-dev' into v4-js-bundle-docs
XhmikosR Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions site/docs/4.5/getting-started/introduction.md
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ Place **one of the following `<script>`s** near the end of your pages, right bef

#### Bundle

Include everything you need in one script with our bundle. Our `bootstrap.bundle.js` and `bootstrap.bundle.min.js` include [Popper](https://popper.js.org/), but not [jQuery](https://jquery.com/). For more information about what's included in Bootstrap, please see our [contents]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/contents/#precompiled-bootstrap) section.
Include every Bootstrap JavaScript plugin with one of our two bundles. Both `bootstrap.bundle.js` and `bootstrap.bundle.min.js` include [Popper](https://popper.js.org/) for our tooltips and popovers, but not [jQuery](https://jquery.com/). Include jQuery first, then a Bootstrap JavaScript bundle. For more information about what's included in Bootstrap, please see our [contents]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/contents/#precompiled-bootstrap) section.

{% highlight html %}
<script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script>
Expand All @@ -41,7 +41,7 @@ Include everything you need in one script with our bundle. Our `bootstrap.bundle

#### Separate

If you decide to go with the separate scripts solution, Popper.js must come first, and then our JavaScript plugins.
If you decide to go with the separate scripts solution, Popper.js must come first (if you're using tooltips or popovers), and then our JavaScript plugins.

{% highlight html %}
<script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script>
Expand All @@ -51,7 +51,7 @@ If you decide to go with the separate scripts solution, Popper.js must come firs

#### Components

Curious which components explicitly require jQuery, our JS, and Popper.js? Click the show components link below. If you're unsure about the page structure, keep reading for an example page template.
Curious which components explicitly require jQuery, our JavaScript, and Popper.js? Click the show components link below. If you're unsure about the page structure, keep reading for an example page template.

<details>
<summary class="text-primary mb-3">Show components requiring JavaScript</summary>
Expand Down