From 89f88762c52f4c7dfca0fe1de6d41386bb673289 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 30 Jan 2022 16:12:24 +0200
Subject: Fix visual tests (#35585)

* Fix visual tests

They broke in #34509

* load bundle.js in visual tests

Co-authored-by: GeoSot <geo.sotis@gmail.com>
---
 js/tests/visual/modal.html | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'js/tests/visual/modal.html')

diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index 719e9cc10..f11edea95 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -199,16 +199,7 @@
       </button>
     </div>
 
-    <script src="../../../node_modules/@popperjs/core/dist/umd/popper.min.js"></script>
-    <script src="../../dist/dom/event-handler.js"></script>
-    <script src="../../dist/dom/selector-engine.js"></script>
-    <script src="../../dist/dom/data.js"></script>
-    <script src="../../dist/dom/manipulator.js"></script>
-    <script src="../../dist/base-component.js"></script>
-    <script src="../../dist/modal.js"></script>
-    <script src="../../dist/collapse.js"></script>
-    <script src="../../dist/tooltip.js"></script>
-    <script src="../../dist/popover.js"></script>
+    <script src="../../../dist/js/bootstrap.bundle.js"></script>
     <script>
       var ffBugTestResult = document.getElementById('ff-bug-test-result')
       var firefoxTestDone = false
@@ -222,11 +213,11 @@
 
       var popoverElements = document.querySelectorAll('[data-bs-toggle="popover"]')
       for (const popoverEl of popoverElements) {
-        new Popover(popoverEl)
+        new bootstrap.Popover(popoverEl)
       }
       var tooltipElements = document.querySelectorAll('[data-bs-toggle="tooltip"]')
       for (const tooltipEl of tooltipElements) {
-        new Tooltip(tooltipEl)
+        new bootstrap.Tooltip(tooltipEl)
       }
 
       var tallToggle = document.getElementById('tall-toggle')
@@ -249,7 +240,7 @@
       ffBugInput.addEventListener('focus', handlerClickFfBugInput)
 
       var btnPreventModal = document.getElementById('btnPreventModal')
-      var modalFf = new Modal(firefoxModal)
+      var modalFf = new bootstrap.Modal(firefoxModal)
 
       btnPreventModal.addEventListener('click', function () {
         function shownFirefoxModal() {
-- 
cgit v1.2.3


From 8959bf3f0bbaca514967661a6b721a3f065f49a9 Mon Sep 17 00:00:00 2001
From: Louis-Maxime Piton <louismaxime.piton@orange.com>
Date: Fri, 20 May 2022 19:21:48 +0200
Subject: Docs: quick fixes for HTML (#36395)

* Using the new helper in the doc

* Remove input from `Tab` access

* Change scrollspy code examples

* Reordering tables for JS

* Fix for parcel file

* Center align all the code example texts in layout

* Alphabetical reorder the helpers
---
 js/tests/visual/modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/tests/visual/modal.html')

diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index f11edea95..ab0986c58 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -184,7 +184,7 @@
 
       <br><br>
 
-      <div class="bg-dark text-white p-2" id="tall" style="display: none;">
+      <div class="text-bg-dark p-2" id="tall" style="display: none;">
         Tall body content to force the page to have a scrollbar.
       </div>
 
-- 
cgit v1.2.3


From 27f20257ebd092b2e5d11a62de0cd5e9cf5a9949 Mon Sep 17 00:00:00 2001
From: GeoSot <geo.sotis@gmail.com>
Date: Thu, 22 Sep 2022 01:48:23 +0300
Subject: Use es6 on visual tests (#36915)

---
 js/tests/visual/modal.html | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

(limited to 'js/tests/visual/modal.html')

diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index ab0986c58..5056c6e7c 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -201,8 +201,8 @@
 
     <script src="../../../dist/js/bootstrap.bundle.js"></script>
     <script>
-      var ffBugTestResult = document.getElementById('ff-bug-test-result')
-      var firefoxTestDone = false
+      const ffBugTestResult = document.getElementById('ff-bug-test-result')
+      const firefoxTestDone = false
 
       function reportFirefoxTestResult(result) {
         if (!firefoxTestDone) {
@@ -211,18 +211,12 @@
         }
       }
 
-      var popoverElements = document.querySelectorAll('[data-bs-toggle="popover"]')
-      for (const popoverEl of popoverElements) {
-        new bootstrap.Popover(popoverEl)
-      }
-      var tooltipElements = document.querySelectorAll('[data-bs-toggle="tooltip"]')
-      for (const tooltipEl of tooltipElements) {
-        new bootstrap.Tooltip(tooltipEl)
-      }
+      document.querySelectorAll('[data-bs-toggle="popover"]').forEach(popoverEl => new bootstrap.Popover(popoverEl))
+
+      document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach(tooltipEl => new bootstrap.Tooltip(tooltipEl))
 
-      var tallToggle = document.getElementById('tall-toggle')
-      var tall = document.getElementById('tall')
-      tallToggle.addEventListener('click', function () {
+      const tall = document.getElementById('tall')
+      document.getElementById('tall-toggle').addEventListener('click', () => {
         if (tall.style.display === 'none') {
           tall.style.display = 'block'
         } else {
@@ -230,8 +224,8 @@
         }
       })
 
-      var ffBugInput = document.getElementById('ff-bug-input')
-      var firefoxModal = document.getElementById('firefoxModal')
+      const ffBugInput = document.getElementById('ff-bug-input')
+      const firefoxModal = document.getElementById('firefoxModal')
       function handlerClickFfBugInput() {
         firefoxModal.addEventListener('focus', reportFirefoxTestResult.bind(false))
         ffBugInput.addEventListener('focus', reportFirefoxTestResult.bind(true))
@@ -239,16 +233,15 @@
       }
       ffBugInput.addEventListener('focus', handlerClickFfBugInput)
 
-      var btnPreventModal = document.getElementById('btnPreventModal')
-      var modalFf = new bootstrap.Modal(firefoxModal)
+      const modalFf = new bootstrap.Modal(firefoxModal)
 
-      btnPreventModal.addEventListener('click', function () {
-        function shownFirefoxModal() {
+      document.getElementById('btnPreventModal').addEventListener('click', () => {
+        const shownFirefoxModal = () => {
           modalFf.hide()
           firefoxModal.removeEventListener('shown.bs.modal', hideFirefoxModal)
         }
 
-        function hideFirefoxModal(event) {
+        const hideFirefoxModal = event => {
           event.preventDefault()
           firefoxModal.removeEventListener('hide.bs.modal', hideFirefoxModal)
 
@@ -266,16 +259,16 @@
       })
 
       // Test transition duration
-      var t0
-      var t1
-      var slowModal = document.getElementById('slowModal')
+      let t0
+      let t1
+      const slowModal = document.getElementById('slowModal')
 
-      slowModal.addEventListener('shown.bs.modal', function () {
+      slowModal.addEventListener('shown.bs.modal', () => {
         t1 = performance.now()
         console.log('transition-duration took ' + (t1 - t0) + 'ms.')
       })
 
-      slowModal.addEventListener('show.bs.modal', function () {
+      slowModal.addEventListener('show.bs.modal', () => {
         t0 = performance.now()
       })
     </script>
-- 
cgit v1.2.3


From abb1cf529fb8dfb8e66e44506eb32f8a9e0e0ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <julien.deramond@orange.com>
Date: Tue, 27 Sep 2022 21:53:59 +0200
Subject: Add eslint-plugin-html to lint JS in HTML files (#37186)

---
 js/tests/visual/modal.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'js/tests/visual/modal.html')

diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index 5056c6e7c..fd93c068a 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -201,6 +201,8 @@
 
     <script src="../../../dist/js/bootstrap.bundle.js"></script>
     <script>
+      /* global bootstrap: false */
+
       const ffBugTestResult = document.getElementById('ff-bug-test-result')
       const firefoxTestDone = false
 
@@ -217,11 +219,7 @@
 
       const tall = document.getElementById('tall')
       document.getElementById('tall-toggle').addEventListener('click', () => {
-        if (tall.style.display === 'none') {
-          tall.style.display = 'block'
-        } else {
-          tall.style.display = 'none'
-        }
+        tall.style.display = tall.style.display === 'none' ? 'block' : 'none'
       })
 
       const ffBugInput = document.getElementById('ff-bug-input')
@@ -231,6 +229,7 @@
         ffBugInput.addEventListener('focus', reportFirefoxTestResult.bind(true))
         ffBugInput.removeEventListener('focus', handlerClickFfBugInput)
       }
+
       ffBugInput.addEventListener('focus', handlerClickFfBugInput)
 
       const modalFf = new bootstrap.Modal(firefoxModal)
-- 
cgit v1.2.3


From 0a5f6e078c9cb9ecca9ab90b3984c5f792a11bae Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 2 Oct 2022 11:02:36 +0100
Subject: Use `<h1>` for all `modal-title` examples/uses (#37210)

* Use `fs-` font sizing classes where needed
* Also add info callout about heading hierarchy in modals
---
 js/tests/visual/modal.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/tests/visual/modal.html')

diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index fd93c068a..b738d9e81 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -38,7 +38,7 @@
         <div class="modal-dialog">
           <div class="modal-content">
             <div class="modal-header">
-              <h4 class="modal-title" id="myModalLabel">Modal title</h4>
+              <h1 class="modal-title fs-4" id="myModalLabel">Modal title</h1>
               <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
@@ -123,7 +123,7 @@
         <div class="modal-dialog">
           <div class="modal-content">
             <div class="modal-header">
-              <h4 class="modal-title" id="firefoxModalLabel">Firefox Bug Test</h4>
+              <h1 class="modal-title fs-4" id="firefoxModalLabel">Firefox Bug Test</h1>
               <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
@@ -147,7 +147,7 @@
         <div class="modal-dialog" style="transition-duration: inherit;">
           <div class="modal-content">
             <div class="modal-header">
-              <h4 class="modal-title" id="slowModalLabel">Lorem slowly</h4>
+              <h1 class="modal-title fs-4" id="slowModalLabel">Lorem slowly</h1>
               <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
@@ -188,7 +188,7 @@
         Tall body content to force the page to have a scrollbar.
       </div>
 
-      <button type="button" class="btn btn-secondary btn-lg" data-bs-toggle="modal" data-bs-target="&#x3C;div class=&#x22;modal fade the-bad&#x22; tabindex=&#x22;-1&#x22;&#x3E;&#x3C;div class=&#x22;modal-dialog&#x22;&#x3E;&#x3C;div class=&#x22;modal-content&#x22;&#x3E;&#x3C;div class=&#x22;modal-header&#x22;&#x3E;&#x3C;button type=&#x22;button&#x22; class=&#x22;btn-close&#x22; data-bs-dismiss=&#x22;modal&#x22; aria-label=&#x22;Close&#x22;&#x3E;&#x3C;span aria-hidden=&#x22;true&#x22;&#x3E;&#x26;times;&#x3C;/span&#x3E;&#x3C;/button&#x3E;&#x3C;h4 class=&#x22;modal-title&#x22;&#x3E;The Bad Modal&#x3C;/h4&#x3E;&#x3C;/div&#x3E;&#x3C;div class=&#x22;modal-body&#x22;&#x3E;This modal&#x27;s HTTML source code is declared inline, inside the data-bs-target attribute of it&#x27;s show-button&#x3C;/div&#x3E;&#x3C;/div&#x3E;&#x3C;/div&#x3E;&#x3C;/div&#x3E;">
+      <button type="button" class="btn btn-secondary btn-lg" data-bs-toggle="modal" data-bs-target="&#x3C;div class=&#x22;modal fade the-bad&#x22; tabindex=&#x22;-1&#x22;&#x3E;&#x3C;div class=&#x22;modal-dialog&#x22;&#x3E;&#x3C;div class=&#x22;modal-content&#x22;&#x3E;&#x3C;div class=&#x22;modal-header&#x22;&#x3E;&#x3C;button type=&#x22;button&#x22; class=&#x22;btn-close&#x22; data-bs-dismiss=&#x22;modal&#x22; aria-label=&#x22;Close&#x22;&#x3E;&#x3C;span aria-hidden=&#x22;true&#x22;&#x3E;&#x26;times;&#x3C;/span&#x3E;&#x3C;/button&#x3E;&#x3C;h1 class=&#x22;modal-title fs-4&#x22;&#x3E;The Bad Modal&#x3C;/h1&#x3E;&#x3C;/div&#x3E;&#x3C;div class=&#x22;modal-body&#x22;&#x3E;This modal&#x27;s HTTML source code is declared inline, inside the data-bs-target attribute of it&#x27;s show-button&#x3C;/div&#x3E;&#x3C;/div&#x3E;&#x3C;/div&#x3E;&#x3C;/div&#x3E;">
         Modal with an XSS inside the data-bs-target
       </button>
 
-- 
cgit v1.2.3


From 5208dd10c4f43b304ebeb75dcf508e016515a248 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sat, 12 Nov 2022 10:09:36 +0200
Subject: ESLint: enable prefer-template rule (#37484)

---
 js/tests/visual/modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/tests/visual/modal.html')

diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index b738d9e81..09d42333d 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -264,7 +264,7 @@
 
       slowModal.addEventListener('shown.bs.modal', () => {
         t1 = performance.now()
-        console.log('transition-duration took ' + (t1 - t0) + 'ms.')
+        console.log(`transition-duration took ${t1 - t0}ms.`)
       })
 
       slowModal.addEventListener('show.bs.modal', () => {
-- 
cgit v1.2.3


From ce114117a8710016022c40e717cb1f3ec95a5d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <juderamond@gmail.com>
Date: Fri, 13 Oct 2023 10:28:08 +0200
Subject: Tests: update navbar in visual modal test (#39294)

---
 js/tests/visual/modal.html | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'js/tests/visual/modal.html')

diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index 09d42333d..efb5127b5 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -13,21 +13,25 @@
     </style>
   </head>
   <body>
-    <nav class="navbar navbar-full navbar-dark bg-dark">
-      <button class="navbar-toggler hidden-lg-up" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"></button>
-      <div class="collapse navbar-expand-md" id="navbarResponsive">
-        <a class="navbar-brand" href="#">This shouldn't jump!</a>
-        <ul class="navbar-nav">
-          <li class="nav-item">
-            <a class="nav-link active" href="#" aria-current="page">Home</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="#">Link</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="#">Link</a>
-          </li>
-        </ul>
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+      <div class="container-fluid">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarResponsive">
+          <a class="navbar-brand" href="#">This shouldn't jump!</a>
+          <ul class="navbar-nav">
+            <li class="nav-item">
+              <a class="nav-link active" href="#" aria-current="page">Home</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="#">Link</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="#">Link</a>
+            </li>
+          </ul>
+        </div>
       </div>
     </nav>
 
-- 
cgit v1.2.3