Merge branch 'main' into remove-unnecessary-twitter-references

twbs · Feb 14, 2025 · 642207c · 642207c
2 parents b32a5c8 + 0f13e1c
commit 642207c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/js/tests/helpers/fixture.js b/js/tests/helpers/fixture.js
@@ -1,11 +1,11 @@
-const fixtureId = 'fixture'
+const FIXTURE_ID = 'fixture'
 
 export const getFixture = () => {
-  let fixtureElement = document.getElementById(fixtureId)
+  let fixtureElement = document.getElementById(FIXTURE_ID)
 
   if (!fixtureElement) {
     fixtureElement = document.createElement('div')
-    fixtureElement.setAttribute('id', fixtureId)
+    fixtureElement.setAttribute('id', FIXTURE_ID)
     fixtureElement.style.position = 'absolute'
     fixtureElement.style.top = '-10000px'
     fixtureElement.style.left = '-10000px'

diff --git a/site/assets/js/partials/code-examples.js b/site/assets/js/partials/code-examples.js
@@ -63,6 +63,11 @@ export default () => {
     const namespace = 'http://www.w3.org/1999/xlink'
     const originalXhref = iconFirstChild.getAttributeNS(namespace, 'href')
     const originalTitle = event.trigger.title
+    const isCheckIconVisible = originalXhref === '#check2'
+
+    if (isCheckIconVisible) {
+      return
+    }
 
     tooltipBtn.setContent({ '.tooltip-inner': 'Copied!' })
     event.trigger.addEventListener('hidden.bs.tooltip', () => {

diff --git a/site/content/docs/5.3/components/modal.md b/site/content/docs/5.3/components/modal.md
@@ -856,7 +856,7 @@ Bootstrap's modal class exposes a few events for hooking into modal functionalit
 {{< bs-table >}}
 | Event | Description |
 | --- | --- |
-| `hide.bs.modal` | This event is fired immediately when the `hide` instance method has been called. |
+| `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. |
 | `hidden.bs.modal` | This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete). |
 | `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`. |
 | `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. |