diff options
| author | Mark Otto <[email protected]> | 2017-05-27 15:26:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-05-27 15:26:48 -0700 |
| commit | 8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910 (patch) | |
| tree | d5a2aba4e2e762b283e7cfe60f00e1f239105bbe /js/tests/visual/modal.html | |
| parent | 6c3f833076a9fa68601741e3e21bd07ad79b7d8a (diff) | |
| parent | db44e4b311317ef760f8412cc33c84146959b248 (diff) | |
| download | bootstrap-8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910.tar.xz bootstrap-8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910.zip | |
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'js/tests/visual/modal.html')
| -rw-r--r-- | js/tests/visual/modal.html | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html index 361bf6b87..def62b031 100644 --- a/js/tests/visual/modal.html +++ b/js/tests/visual/modal.html @@ -3,7 +3,6 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - <meta http-equiv="x-ua-compatible" content="ie=edge"> <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css"> <title>Modal</title> <style> @@ -16,9 +15,9 @@ <body> <nav class="navbar navbar-full navbar-dark bg-inverse"> <button class="navbar-toggler hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"></button> - <div class="collapse navbar-toggleable-md" id="navbarResponsive"> + <div class="collapse navbar-expand-md" id="navbarResponsive"> <a class="navbar-brand" href="#">This shouldn't jump!</a> - <ul class="nav navbar-nav"> + <ul class="navbar-nav"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -55,7 +54,7 @@ <h4>Tooltips in a modal</h4> <p><a href="#" data-toggle="tooltip" data-placement="top" title="Tooltip on top">This link</a> and <a href="#" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">that link</a> should have tooltips on hover.</p> - <div id="accordion" role="tablist" aria-multiselectable="true"> + <div id="accordion" role="tablist"> <div class="card"> <div class="card-header" role="tab" id="headingOne"> <h5 class="mb-0"> @@ -170,8 +169,8 @@ </div> </div> - <script src="../vendor/jquery.min.js"></script> - <script src="../vendor/tether.min.js"></script> + <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> + <script src="../../../docs/assets/js/vendor/popper.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/modal.js"></script> <script src="../../dist/collapse.js"></script> @@ -188,26 +187,6 @@ } } - // Should throw an error because modal is in transition - function testModalTransitionError() { - var err = false - // Close #myModal - $('#myModal').on('shown.bs.modal', function () { - $('#myModal').modal('hide').off('shown.bs.modal') - if (!err) { - alert('No error thrown for : testModalTransitionError') - } - }) - - try { - $('#myModal').modal('show').modal('hide') - } - catch (e) { - err = true - console.error(e.message) - } - } - $(function () { $('[data-toggle="popover"]').popover() $('[data-toggle="tooltip"]').tooltip() @@ -220,7 +199,6 @@ $('#firefoxModal').on('focus', reportFirefoxTestResult.bind(false)) $('#ff-bug-input').on('focus', reportFirefoxTestResult.bind(true)) }) - testModalTransitionError() }) </script> </body> |