diff options
| author | XhmikosR <[email protected]> | 2019-02-24 15:42:18 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-02-24 15:42:18 +0200 |
| commit | 5ad21218192ddab3d798203065ac947cce03d76d (patch) | |
| tree | 18d22047d15fe386092523fee5f4b30bbc9e95bc /js/tests/visual/modal.html | |
| parent | 5328d0db0d3ce909dca12b9ded4356da6f5971e4 (diff) | |
| download | bootstrap-5ad21218192ddab3d798203065ac947cce03d76d.tar.xz bootstrap-5ad21218192ddab3d798203065ac947cce03d76d.zip | |
Remove DOMContentLoaded. (#28337)
There's no reason for us to wait here.
Diffstat (limited to 'js/tests/visual/modal.html')
| -rw-r--r-- | js/tests/visual/modal.html | 125 |
1 files changed, 61 insertions, 64 deletions
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html index d9e69f9d5..b5897c932 100644 --- a/js/tests/visual/modal.html +++ b/js/tests/visual/modal.html @@ -217,86 +217,83 @@ <script src="../../dist/tooltip.js"></script> <script src="../../dist/popover.js"></script> <script> + var ffBugTestResult = document.getElementById('ff-bug-test-result') var firefoxTestDone = false - document.addEventListener('DOMContentLoaded', function () { - var ffBugTestResult = document.getElementById('ff-bug-test-result') - function reportFirefoxTestResult(result) { - if (!firefoxTestDone) { - ffBugTestResult.classList - .add(result ? 'text-success' : 'text-danger') - - ffBugTestResult.innerHTML = result ? 'PASS' : 'FAIL' - } + function reportFirefoxTestResult(result) { + if (!firefoxTestDone) { + ffBugTestResult.classList.add(result ? 'text-success' : 'text-danger') + ffBugTestResult.innerHTML = result ? 'PASS' : 'FAIL' } + } - [].slice.call(document.querySelectorAll('[data-toggle="popover"]')) - .forEach(function (popover) { - new Popover(popover) - }) - - var tooltipList = [].slice.call(document.querySelectorAll('[data-toggle="tooltip"]')) - tooltipList.forEach(function (tooltip) { - new Tooltip(tooltip) - }) - - var tallToggle = document.getElementById('tall-toggle') - var tall = document.getElementById('tall') - tallToggle.addEventListener('click', function () { - if (tall.style.display === 'none') { - tall.style.display = 'block' - } else { - tall.style.display = 'none' - } + [].slice.call(document.querySelectorAll('[data-toggle="popover"]')) + .forEach(function (popover) { + new Popover(popover) }) - var ffBugInput = document.getElementById('ff-bug-input') - var firefoxModal = document.getElementById('firefoxModal') - function handlerClickFfBugInput() { - firefoxModal.addEventListener('focus', reportFirefoxTestResult.bind(false)) - ffBugInput.addEventListener('focus', reportFirefoxTestResult.bind(true)) - ffBugInput.removeEventListener('focus', handlerClickFfBugInput) + var tooltipList = [].slice.call(document.querySelectorAll('[data-toggle="tooltip"]')) + tooltipList.forEach(function (tooltip) { + new Tooltip(tooltip) + }) + + var tallToggle = document.getElementById('tall-toggle') + var tall = document.getElementById('tall') + tallToggle.addEventListener('click', function () { + if (tall.style.display === 'none') { + tall.style.display = 'block' + } else { + tall.style.display = 'none' } - ffBugInput.addEventListener('focus', handlerClickFfBugInput) + }) - var btnPreventModal = document.getElementById('btnPreventModal') - var modalFf = new Modal(firefoxModal) + var ffBugInput = document.getElementById('ff-bug-input') + var firefoxModal = document.getElementById('firefoxModal') + function handlerClickFfBugInput() { + firefoxModal.addEventListener('focus', reportFirefoxTestResult.bind(false)) + ffBugInput.addEventListener('focus', reportFirefoxTestResult.bind(true)) + ffBugInput.removeEventListener('focus', handlerClickFfBugInput) + } + ffBugInput.addEventListener('focus', handlerClickFfBugInput) - btnPreventModal.addEventListener('click', function () { - function shownFirefoxModal() { - modalFf.hide() - firefoxModal.removeEventListener('shown.bs.modal', hideFirefoxModal) - } + var btnPreventModal = document.getElementById('btnPreventModal') + var modalFf = new Modal(firefoxModal) - function hideFirefoxModal(event) { - event.preventDefault() - firefoxModal.removeEventListener('hide.bs.modal', hideFirefoxModal) + btnPreventModal.addEventListener('click', function () { + function shownFirefoxModal() { + modalFf.hide() + firefoxModal.removeEventListener('shown.bs.modal', hideFirefoxModal) + } + + function hideFirefoxModal(event) { + event.preventDefault() + firefoxModal.removeEventListener('hide.bs.modal', hideFirefoxModal) - if (modalFf._isTransitioning) { - console.error('Modal plugin should not set _isTransitioning when hide event is prevented') - } else { - console.log('Test passed') - modalFf.hide() // work as expected - } + if (modalFf._isTransitioning) { + console.error('Modal plugin should not set _isTransitioning when hide event is prevented') + } else { + console.log('Test passed') + modalFf.hide() // work as expected } + } - firefoxModal.addEventListener('shown.bs.modal', shownFirefoxModal) - firefoxModal.addEventListener('hide.bs.modal', hideFirefoxModal) - modalFf.show() - }) + firefoxModal.addEventListener('shown.bs.modal', shownFirefoxModal) + firefoxModal.addEventListener('hide.bs.modal', hideFirefoxModal) + modalFf.show() + }) - // Test transition duration - var t0, t1; - var slowModal = document.getElementById('slowModal') + // Test transition duration + var t0 + var t1 + var slowModal = document.getElementById('slowModal') - slowModal.addEventListener('shown.bs.modal', function () { - t1 = performance.now() - console.log('transition-duration took ' + (t1 - t0) + 'ms.') - }) + slowModal.addEventListener('shown.bs.modal', function () { + t1 = performance.now() + console.log('transition-duration took ' + (t1 - t0) + 'ms.') + }) - slowModal.addEventListener('show.bs.modal', function () { - t0 = performance.now() - }) + slowModal.addEventListener('show.bs.modal', function () { + t0 = performance.now() }) </script> </body> |
