aboutsummaryrefslogtreecommitdiffstats
path: root/tests/visual/tooltip
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2015-09-30 09:49:13 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2015-09-30 17:55:20 +0200
commitb698f809de908535acd93c690d90d867622ddd7e (patch)
tree0929237517ef5edde429a1ab615bcc22222f773b /tests/visual/tooltip
parentc02f59981f4c8aa2c606e22e0325dd34457c8b45 (diff)
downloadjquery-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/tooltip')
-rw-r--r--tests/visual/tooltip/animations.html67
-rw-r--r--tests/visual/tooltip/tooltip.html11
2 files changed, 30 insertions, 48 deletions
diff --git a/tests/visual/tooltip/animations.html b/tests/visual/tooltip/animations.html
index 6131db436..7427d7ebd 100644
--- a/tests/visual/tooltip/animations.html
+++ b/tests/visual/tooltip/animations.html
@@ -4,16 +4,6 @@
<meta charset="utf-8">
<title>Tooltip Visual Test: Animations</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/tooltip.js"></script>
- <script src="../../../ui/effect.js"></script>
- <script src="../../../ui/effect-blind.js"></script>
- <script src="../../../ui/effect-bounce.js"></script>
- <script src="../../../ui/effect-drop.js"></script>
- <script src="../../../ui/effect-explode.js"></script>
<style>
pre {
width: 250px;
@@ -21,52 +11,51 @@
padding: .5em;
}
</style>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js">
$( "pre" ).each(function( index, elem ) {
$( elem )
.attr( "title", "animated tooltips" )
.tooltip( $.parseJSON( $( elem ).text() ) );
});
- });
</script>
</head>
<body>
<pre>{}</pre>
<pre>{
- "show": {
- "effect": "slideDown"
- },
- "hide": {
- "effect": "slideUp"
- }
+ "show": {
+ "effect": "slideDown"
+ },
+ "hide": {
+ "effect": "slideUp"
+ }
}</pre>
<pre>{
- "show": {
- "effect": "explode"
- },
- "hide": {
- "effect": "explode"
- }
+ "show": {
+ "effect": "explode"
+ },
+ "hide": {
+ "effect": "explode"
+ }
}</pre>
<pre>{
- "show": {
- "effect": "bounce"
- },
- "hide": {
- "effect": "blind"
- }
+ "show": {
+ "effect": "bounce"
+ },
+ "hide": {
+ "effect": "blind"
+ }
}</pre>
<pre>{
- "show": {
- "effect": "drop",
- "direction": "right"
- },
- "hide": {
- "effect": "drop",
- "direction": "right"
- }
+ "show": {
+ "effect": "drop",
+ "direction": "right"
+ },
+ "hide": {
+ "effect": "drop",
+ "direction": "right"
+ }
}</pre>
</body>
diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html
index 176af85d8..9453190d7 100644
--- a/tests/visual/tooltip/tooltip.html
+++ b/tests/visual/tooltip/tooltip.html
@@ -4,19 +4,13 @@
<meta charset="utf-8">
<title>Tooltip Visual Test: Default</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/button.js"></script>
- <script src="../../../ui/tooltip.js"></script>
<style>
.group {
margin-top: 2em;
}
</style>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="button">
// default
$( "#context1, form, #childish, #nested-input" ).tooltip();
@@ -103,7 +97,6 @@
}).on( "click", function() {
$( "#focus-on-me" ).trigger( "focus" );
});
- });
</script>
</head>
<body>