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/dialog | |
| 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/dialog')
| -rw-r--r-- | tests/visual/dialog/animated.html | 17 | ||||
| -rw-r--r-- | tests/visual/dialog/complex-dialogs.html | 21 | ||||
| -rw-r--r-- | tests/visual/dialog/form.html | 17 | ||||
| -rw-r--r-- | tests/visual/dialog/performance.html | 14 | ||||
| -rw-r--r-- | tests/visual/dialog/stacking.html | 15 |
5 files changed, 10 insertions, 74 deletions
diff --git a/tests/visual/dialog/animated.html b/tests/visual/dialog/animated.html index 2bb0b398b..2fd1d04a6 100644 --- a/tests/visual/dialog/animated.html +++ b/tests/visual/dialog/animated.html @@ -4,20 +4,8 @@ <meta charset="utf-8"> <title>Dialog Visual Test</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/mouse.js"></script> - <script src="../../../ui/draggable.js"></script> - <script src="../../../ui/position.js"></script> - <script src="../../../ui/resizable.js"></script> - <script src="../../../ui/button.js"></script> - <script src="../../../ui/dialog.js"></script> - <script src="../../../ui/effect.js"></script> - <script src="../../../ui/effect-blind.js"></script> - <script src="../../../ui/effect-explode.js"></script> - <script> - $(function() { + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../demos/bootstrap.js" data-modules="effect-blind effect-explode"> $( "#dialog" ).dialog({ autoOpen: false, show: { @@ -34,7 +22,6 @@ $( "#opener" ).on( "click", function() { $( "#dialog" ).dialog( "open" ); }); - }); </script> </head> <body> diff --git a/tests/visual/dialog/complex-dialogs.html b/tests/visual/dialog/complex-dialogs.html index 9a6209be9..0bea3414e 100644 --- a/tests/visual/dialog/complex-dialogs.html +++ b/tests/visual/dialog/complex-dialogs.html @@ -4,24 +4,8 @@ <meta charset="utf-8"> <title>Dialog Visual Test</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/mouse.js"></script> - <script src="../../../ui/draggable.js"></script> - <script src="../../../ui/position.js"></script> - <script src="../../../ui/resizable.js"></script> - <script src="../../../ui/button.js"></script> - <script src="../../../ui/dialog.js"></script> - - <!-- stuff needed to make things complex --> - <script src="../../../ui/datepicker.js"></script> - <script src="../../../ui/menu.js"></script> - <script src="../../../ui/autocomplete.js"></script> - <script src="../../../ui/tooltip.js"></script> - - <script> - $(function() { + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../demos/bootstrap.js" data-modules="datepicker autocomplete tooltip"> var dialog = $( "#dialog" ).dialog({ modal: true, width: 500, @@ -87,7 +71,6 @@ }); $( document ).tooltip(); - }); </script> </head> <body> diff --git a/tests/visual/dialog/form.html b/tests/visual/dialog/form.html index 42d40f1f4..b1cdaa54a 100644 --- a/tests/visual/dialog/form.html +++ b/tests/visual/dialog/form.html @@ -4,20 +4,8 @@ <meta charset="utf-8"> <title>Dialog Visual Test</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/mouse.js"></script> - <script src="../../../ui/draggable.js"></script> - <script src="../../../ui/position.js"></script> - <script src="../../../ui/resizable.js"></script> - <script src="../../../ui/button.js"></script> - <script src="../../../ui/dialog.js"></script> - <script src="../../../ui/effect.js"></script> - <script src="../../../ui/effect-blind.js"></script> - <script src="../../../ui/effect-explode.js"></script> - <script> - $(function() { + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../demos/bootstrap.js"> $( "#form-dialog, #prompt-dialog" ).dialog({ autoOpen: false, modal: true @@ -30,7 +18,6 @@ $( "#open-prompt" ).on( "click", function() { $( "#prompt-dialog" ).dialog( "open" ); }); - }); </script> <style> label { diff --git a/tests/visual/dialog/performance.html b/tests/visual/dialog/performance.html index e01098ad1..20adbfa6b 100644 --- a/tests/visual/dialog/performance.html +++ b/tests/visual/dialog/performance.html @@ -4,17 +4,8 @@ <meta charset="utf-8"> <title>Dialog Visual Test - Modal Dialog in Large DOM</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/position.js"></script> - <script src="../../../ui/widget.js"></script> - <script src="../../../ui/mouse.js"></script> - <script src="../../../ui/draggable.js"></script> - <script src="../../../ui/resizable.js"></script> - <script src="../../../ui/button.js"></script> - <script src="../../../ui/dialog.js"></script> - <script> - $(function() { + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../demos/bootstrap.js"> var start, html = new Array( 500 ).join( $.trim( $( "#template" ).html() ) ); $( html ).appendTo( "body" ); @@ -31,7 +22,6 @@ $( "#dialog" ).dialog( "open" ); $( "<li>Open: " + ($.now() - start) + "ms</li>" ).appendTo( "#log" ); }); - }); </script> </head> <body> diff --git a/tests/visual/dialog/stacking.html b/tests/visual/dialog/stacking.html index 221498a55..e2e23e58a 100644 --- a/tests/visual/dialog/stacking.html +++ b/tests/visual/dialog/stacking.html @@ -4,18 +4,8 @@ <meta charset="utf-8"> <title>Dialog Visual Test</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/mouse.js"></script> - <script src="../../../ui/draggable.js"></script> - <script src="../../../ui/position.js"></script> - <script src="../../../ui/resizable.js"></script> - <script src="../../../ui/button.js"></script> - <script src="../../../ui/dialog.js"></script> - - <script> - $(function() { + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../demos/bootstrap.js"> var iframeDialog = $( "#dialog-iframe" ).dialog({ position: { my: "right-90 center" @@ -34,7 +24,6 @@ width: 200, height: 150 }); - }); </script> </head> <body> |