Skip to content

Commit 642207c

Browse files
Merge branch 'main' into remove-unnecessary-twitter-references
2 parents b32a5c8 + 0f13e1c commit 642207c

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

js/tests/helpers/fixture.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const fixtureId = 'fixture'
1+
const FIXTURE_ID = 'fixture'
22

33
export const getFixture = () => {
4-
let fixtureElement = document.getElementById(fixtureId)
4+
let fixtureElement = document.getElementById(FIXTURE_ID)
55

66
if (!fixtureElement) {
77
fixtureElement = document.createElement('div')
8-
fixtureElement.setAttribute('id', fixtureId)
8+
fixtureElement.setAttribute('id', FIXTURE_ID)
99
fixtureElement.style.position = 'absolute'
1010
fixtureElement.style.top = '-10000px'
1111
fixtureElement.style.left = '-10000px'

site/assets/js/partials/code-examples.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ export default () => {
6363
const namespace = 'http://www.w3.org/1999/xlink'
6464
const originalXhref = iconFirstChild.getAttributeNS(namespace, 'href')
6565
const originalTitle = event.trigger.title
66+
const isCheckIconVisible = originalXhref === '#check2'
67+
68+
if (isCheckIconVisible) {
69+
return
70+
}
6671

6772
tooltipBtn.setContent({ '.tooltip-inner': 'Copied!' })
6873
event.trigger.addEventListener('hidden.bs.tooltip', () => {

site/content/docs/5.3/components/modal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ Bootstrap's modal class exposes a few events for hooking into modal functionalit
856856
{{< bs-table >}}
857857
| Event | Description |
858858
| --- | --- |
859-
| `hide.bs.modal` | This event is fired immediately when the `hide` instance method has been called. |
859+
| `hide.bs.modal` | This event is fired immediately when the `hide` instance method has been called. Can be prevented by calling `event.preventDefault()`. See [JavaScript events documentation]({{< docsref "/getting-started/javascript#events" >}}) for more details on event prevention. |
860860
| `hidden.bs.modal` | This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete). |
861861
| `hidePrevented.bs.modal` | This event is fired when the modal is shown, its backdrop is `static` and a click outside of the modal is performed. The event is also fired when the escape key is pressed and the `keyboard` option is set to `false`. |
862862
| `show.bs.modal` | This event fires immediately when the `show` instance method is called. If caused by a click, the clicked element is available as the `relatedTarget` property of the event. |

0 commit comments

Comments
 (0)