Skip to content

Commit

Permalink
Remove DOMContentLoaded.
Browse files Browse the repository at this point in the history
There's no reason for us to wait here.
  • Loading branch information
XhmikosR committed Feb 21, 2019
1 parent 423e4a3 commit c7a07cf
Show file tree
Hide file tree
Showing 5 changed files with 158 additions and 163 deletions.
23 changes: 11 additions & 12 deletions js/tests/visual/carousel.html
Expand Up @@ -54,19 +54,18 @@ <h1>Carousel <small>Bootstrap Visual Test</small></h1>
<script src="../../dist/util.js"></script>
<script src="../../dist/carousel.js"></script>
<script>
document.addEventListener('DOMContentLoaded', function () {
var t0, t1;
var carousel = document.getElementById('carousel-example-generic')
var t0
var t1
var carousel = document.getElementById('carousel-example-generic')

// Test to show that the carousel doesn't slide when the current tab isn't visible
// Test to show that transition-duration can be changed with css
carousel.addEventListener('slid.bs.carousel', function (event) {
t1 = performance.now()
console.log('transition-duration took ' + (t1 - t0) + 'ms, slid at ', event.timeStamp)
})
carousel.addEventListener('slide.bs.carousel', function () {
t0 = performance.now()
})
// Test to show that the carousel doesn't slide when the current tab isn't visible
// Test to show that transition-duration can be changed with css
carousel.addEventListener('slid.bs.carousel', function (event) {
t1 = performance.now()
console.log('transition-duration took ' + (t1 - t0) + 'ms, slid at ', event.timeStamp)
})
carousel.addEventListener('slide.bs.carousel', function () {
t0 = performance.now()
})
</script>
</body>
Expand Down
10 changes: 6 additions & 4 deletions js/tests/visual/modal.html
Expand Up @@ -217,8 +217,9 @@ <h4 class="modal-title" id="slowModalLabel">Lorem slowly</h4>
<script src="../../dist/tooltip.js"></script>
<script src="../../dist/popover.js"></script>
<script>
var firefoxTestDone = false
document.addEventListener('DOMContentLoaded', function () {
var firefoxTestDone = false;

(function () {
var ffBugTestResult = document.getElementById('ff-bug-test-result')

function reportFirefoxTestResult(result) {
Expand Down Expand Up @@ -286,7 +287,8 @@ <h4 class="modal-title" id="slowModalLabel">Lorem slowly</h4>
})

// Test transition duration
var t0, t1;
var t0
var t1
var slowModal = document.getElementById('slowModal')

slowModal.addEventListener('shown.bs.modal', function () {
Expand All @@ -297,7 +299,7 @@ <h4 class="modal-title" id="slowModalLabel">Lorem slowly</h4>
slowModal.addEventListener('show.bs.modal', function () {
t0 = performance.now()
})
})
})()
</script>
</body>
</html>
10 changes: 4 additions & 6 deletions js/tests/visual/popover.html
Expand Up @@ -41,12 +41,10 @@ <h1>Popover <small>Bootstrap Visual Test</small></h1>
<script src="../../dist/tooltip.js"></script>
<script src="../../dist/popover.js"></script>
<script>
document.addEventListener('DOMContentLoaded', function () {
[].slice.call(document.querySelectorAll('[data-toggle="popover"]'))
.forEach(function (popover) {
new Popover(popover)
})
})
[].slice.call(document.querySelectorAll('[data-toggle="popover"]'))
.forEach(function (popover) {
new Popover(popover)
})
</script>
</body>
</html>
56 changes: 27 additions & 29 deletions js/tests/visual/tooltip.html
Expand Up @@ -80,40 +80,38 @@ <h1>Tooltip <small>Bootstrap Visual Test</small></h1>
<script src="../../dist/dom/selectorEngine.js"></script>
<script src="../../dist/tooltip.js"></script>
<script>
document.addEventListener('DOMContentLoaded', function () {
if (typeof document.body.attachShadow === 'function') {
var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' })
shadowRoot.innerHTML =
'<button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Tooltip on top in a shadow dom">' +
' Tooltip on top in a shadow dom' +
'</button>' +
'<button id="secondTooltip" type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Tooltip on top in a shadow dom with container option">' +
' Tooltip on top in a shadow dom' +
'</button>'
if (typeof document.body.attachShadow === 'function') {
var shadowRoot = document.getElementById('shadow').attachShadow({ mode: 'open' })
shadowRoot.innerHTML =
'<button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Tooltip on top in a shadow dom">' +
' Tooltip on top in a shadow dom' +
'</button>' +
'<button id="secondTooltip" type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Tooltip on top in a shadow dom with container option">' +
' Tooltip on top in a shadow dom' +
'</button>'

var firstChildTooltip = new Tooltip(shadowRoot.firstChild)
var secondChildTooltip = new Tooltip(shadowRoot.getElementById('secondTooltip'), {
container: shadowRoot
})
}

[].slice.call(document.querySelectorAll('[data-toggle="tooltip"]'))
.forEach(function (tooltip) {
new Tooltip(tooltip)
})

var tooltipElement = document.getElementById('tooltipElement')
var tooltipElementInstance = new Tooltip(tooltipElement, {
container: document.getElementById('customContainer')
var firstChildTooltip = new Tooltip(shadowRoot.firstChild)
var secondChildTooltip = new Tooltip(shadowRoot.getElementById('secondTooltip'), {
container: shadowRoot
})
}

var target = document.getElementById('target')
var targetTooltip = new Tooltip(target, {
placement : 'top',
trigger : 'manual'
[].slice.call(document.querySelectorAll('[data-toggle="tooltip"]'))
.forEach(function (tooltip) {
new Tooltip(tooltip)
})
targetTooltip.show()

var tooltipElement = document.getElementById('tooltipElement')
var tooltipElementInstance = new Tooltip(tooltipElement, {
container: document.getElementById('customContainer')
})

var target = document.getElementById('target')
var targetTooltip = new Tooltip(target, {
placement : 'top',
trigger : 'manual'
})
targetTooltip.show()
</script>
</body>
</html>

0 comments on commit c7a07cf

Please sign in to comment.