diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2015-09-30 09:49:13 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2015-09-30 17:55:20 +0200 |
| commit | b698f809de908535acd93c690d90d867622ddd7e (patch) | |
| tree | 0929237517ef5edde429a1ab615bcc22222f773b /tests/visual/position | |
| parent | c02f59981f4c8aa2c606e22e0325dd34457c8b45 (diff) | |
| download | jquery-ui-b698f809de908535acd93c690d90d867622ddd7e.tar.gz jquery-ui-b698f809de908535acd93c690d90d867622ddd7e.zip | |
Tests: Use demo bootstrap for visual tests
Adds a data-composite option and fixes paths for effects. Otherwise
just applies the same conversion as already applied to demos, sometimes
moving a <style> element to the right place.
Diffstat (limited to 'tests/visual/position')
| -rw-r--r-- | tests/visual/position/position.html | 11 | ||||
| -rw-r--r-- | tests/visual/position/position_feedback.html | 128 |
2 files changed, 63 insertions, 76 deletions
diff --git a/tests/visual/position/position.html b/tests/visual/position/position.html index 70a9c40e5..d5c19fd32 100644 --- a/tests/visual/position/position.html +++ b/tests/visual/position/position.html @@ -3,12 +3,6 @@ <head> <meta charset="utf-8"> <title>Position Visual Test</title> - <script src="../../../external/jquery/jquery.js"></script> - <script src="../../../ui/core.js"></script> - <script src="../../../ui/widget.js"></script> - <script src="../../../ui/mouse.js"></script> - <script src="../../../ui/draggable.js"></script> - <script src="../../../ui/position.js"></script> <style> .demo { position: relative; @@ -34,8 +28,8 @@ margin: 0 15px 15px 0; } </style> - <script> - $(function() { + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../demos/bootstrap.js" data-modules="draggable"> var within = $( ".demo" ), positionable = $( ".positionable" ); function position() { @@ -67,7 +61,6 @@ $( "select, input" ).on( "click keyup change", function() { position(); } ); position(); - }); </script> </head> <body> diff --git a/tests/visual/position/position_feedback.html b/tests/visual/position/position_feedback.html index 988451026..f094b5148 100644 --- a/tests/visual/position/position_feedback.html +++ b/tests/visual/position/position_feedback.html @@ -4,13 +4,67 @@ <meta charset="utf-8"> <title>Position Visual Test: Feedback</title> <link rel="stylesheet" href="../../../themes/base/all.css"> - <script src="../../../external/jquery/jquery.js"></script> - <script src="../../../ui/core.js"></script> - <script src="../../../ui/widget.js"></script> - <script src="../../../ui/position.js"></script> - <script src="../../../ui/menu.js"></script> - <script> - $(function() { + <style> + #target, .element { + position: absolute; + border: 1px solid black; + border-radius: 5px; + width: 75px; + height: 25px; + padding: 5px; + font-size: 62.5%; + } + #target { + height: 75px; + } + .element:before { + font-size: 12pt; + content: "↑"; + position: absolute; + top: -19px; + left: 5px; + } + .right:before { + left: auto; + right: 5px; + } + .bottom:before { + content: "↓"; + top: auto; + bottom: -19px; + } + .center:before { + left: 50%; + right: auto; + } + .middle:before { + top: 50%; + bottom: auto; + } + .horizontal:before { + height: 10px; + top: 50%; + margin-top: -8px; + bottom: auto; + left: -18px; + right: auto; + content: "←"; + } + .right.horizontal:before { + left: auto; + right: -18px; + content: "→"; + } + .bottom.horizontal:before { + top: auto; + bottom: 5px; + } + .top.horizontal:before { + top: 5px; + } + </style> + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../demos/bootstrap.js"> function using( position, feedback ) { $( this ) .css( position ) @@ -74,67 +128,7 @@ rightElement.position( positionWithOffset( 0.9 * (event.pageX - targetOffset.left), -0.9 * (event.pageY - targetOffset.top) ) ); }); - }); </script> - <style> - #target, .element { - position: absolute; - border: 1px solid black; - border-radius: 5px; - width: 75px; - height: 25px; - padding: 5px; - font-size: 62.5%; - } - #target { - height: 75px; - } - .element:before { - font-size: 12pt; - content: "↑"; - position: absolute; - top: -19px; - left: 5px; - } - .right:before { - left: auto; - right: 5px; - } - .bottom:before { - content: "↓"; - top: auto; - bottom: -19px; - } - .center:before { - left: 50%; - right: auto; - } - .middle:before { - top: 50%; - bottom: auto; - } - .horizontal:before { - height: 10px; - top: 50%; - margin-top: -8px; - bottom: auto; - left: -18px; - right: auto; - content: "←"; - } - .right.horizontal:before { - left: auto; - right: -18px; - content: "→"; - } - .bottom.horizontal:before { - top: auto; - bottom: 5px; - } - .top.horizontal:before { - top: 5px; - } - </style> </head> <body> |