Skip to content

Commit 1035a86

Browse files
Merge pull request #878 from twbs/main
Create a new pull request by comparing changes across two branches
2 parents facd7b7 + 523493d commit 1035a86

File tree

6 files changed

+27
-7
lines changed

6 files changed

+27
-7
lines changed

js/src/tooltip.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ class Tooltip extends BaseComponent {
160160
return
161161
}
162162

163-
this._activeTrigger.click = !this._activeTrigger.click
164163
if (this._isShown()) {
165164
this._leave()
166165
return

js/tests/unit/popover.spec.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,26 @@ describe('Popover', () => {
5656
})
5757

5858
describe('show', () => {
59+
it('should toggle a popover after show', () => {
60+
return new Promise(resolve => {
61+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
62+
63+
const popoverEl = fixtureEl.querySelector('a')
64+
const popover = new Popover(popoverEl)
65+
66+
popoverEl.addEventListener('shown.bs.popover', () => {
67+
expect(document.querySelector('.popover')).not.toBeNull()
68+
popover.toggle()
69+
})
70+
popoverEl.addEventListener('hidden.bs.popover', () => {
71+
expect(document.querySelector('.popover')).toBeNull()
72+
resolve()
73+
})
74+
75+
popover.show()
76+
})
77+
})
78+
5979
it('should show a popover', () => {
6080
return new Promise(resolve => {
6181
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
"lockfile-lint": "^4.14.0",
144144
"nodemon": "^3.1.4",
145145
"npm-run-all2": "^6.2.2",
146-
"postcss": "^8.4.44",
146+
"postcss": "^8.4.45",
147147
"postcss-cli": "^11.0.0",
148148
"rollup": "^4.21.2",
149149
"rollup-plugin-istanbul": "^5.0.0",

site/content/docs/5.3/customize/options.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ You can find and customize these variables for key global options in Bootstrap's
2020
| `$enable-transitions` | `true` (default) or `false` | Enables predefined `transition`s on various components. |
2121
| `$enable-reduced-motion` | `true` (default) or `false` | Enables the [`prefers-reduced-motion` media query]({{< docsref "/getting-started/accessibility#reduced-motion" >}}), which suppresses certain animations/transitions based on the users' browser/operating system preferences. |
2222
| `$enable-grid-classes` | `true` (default) or `false` | Enables the generation of CSS classes for the grid system (e.g. `.row`, `.col-md-1`, etc.). |
23+
| `$enable-css-grid` | `true` or `false` (default) | Enables the experimental CSS Grid system (e.g. `.grid`, `.g-col-md-1`, etc.). |
2324
| `$enable-container-classes` | `true` (default) or `false` | Enables the generation of CSS classes for layout containers. (New in v5.2.0) |
2425
| `$enable-caret` | `true` (default) or `false` | Enables pseudo element caret on `.dropdown-toggle`. |
2526
| `$enable-button-pointers` | `true` (default) or `false` | Add "hand" cursor to non-disabled button elements. |

site/content/docs/5.3/helpers/stacks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ added:
1111
Stacks offer a shortcut for applying a number of flexbox properties to quickly and easily create layouts in Bootstrap. All credit for the concept and implementation goes to the open source [Pylon project](https://almonk.github.io/pylon/).
1212

1313
{{< callout warning >}}
14-
**Heads up!** Support for gap utilities with flexbox was recently added to Safari, so consider verifying your intended browser support. Grid layout should have no issues. [Read more](https://caniuse.com/flexbox-gap).
14+
**Heads up!** Support for gap utilities with flexbox isn't available in Safari prior to 14.5, so consider verifying your intended browser support. Grid layout should have no issues. [Read more](https://caniuse.com/flexbox-gap).
1515
{{< /callout >}}
1616

1717
## Vertical

0 commit comments

Comments
 (0)