aboutsummaryrefslogtreecommitdiffstats
path: root/tests/visual/compound
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/compound
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/compound')
-rw-r--r--tests/visual/compound/accordion_tabs.html10
-rw-r--r--tests/visual/compound/datepicker_dialog.html15
-rw-r--r--tests/visual/compound/dialog_widgets.html25
-rw-r--r--tests/visual/compound/draggable_accordion.html12
-rw-r--r--tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html13
-rw-r--r--tests/visual/compound/draggable_resizable.html12
-rw-r--r--tests/visual/compound/sortable_accordion_sortable_tabs.html13
-rw-r--r--tests/visual/compound/tabs_selectmenu.html12
-rw-r--r--tests/visual/compound/tabs_tabs.html10
-rw-r--r--tests/visual/compound/tabs_tooltips.html11
10 files changed, 26 insertions, 107 deletions
diff --git a/tests/visual/compound/accordion_tabs.html b/tests/visual/compound/accordion_tabs.html
index 68207d151..3f2f93712 100644
--- a/tests/visual/compound/accordion_tabs.html
+++ b/tests/visual/compound/accordion_tabs.html
@@ -5,16 +5,10 @@
<title>Compound Visual Test : Accordion in Tabs</title>
<link rel="stylesheet" href="../visual.css">
<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/accordion.js"></script>
- <script src="../../../ui/tabs.js"></script>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="tabs accordion" data-composite="true">
$( "#accordion-1, #accordion-2" ).accordion();
$( "#tabs" ).tabs();
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/datepicker_dialog.html b/tests/visual/compound/datepicker_dialog.html
index 52c91a083..ba1a1de7e 100644
--- a/tests/visual/compound/datepicker_dialog.html
+++ b/tests/visual/compound/datepicker_dialog.html
@@ -5,21 +5,10 @@
<title>Compound Visual Test : Datepicker in Dialog</title>
<link rel="stylesheet" href="../visual.css">
<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/position.js"></script>
- <script src="../../../ui/resizable.js"></script>
- <script src="../../../ui/draggable.js"></script>
- <script src="../../../ui/button.js"></script>
- <script src="../../../ui/datepicker.js"></script>
- <script src="../../../ui/dialog.js"></script>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="datepicker dialog" data-composite="true">
$( "#datepicker" ).datepicker();
$( "#dialog" ).dialog();
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/dialog_widgets.html b/tests/visual/compound/dialog_widgets.html
index 2258231e9..f84ef0123 100644
--- a/tests/visual/compound/dialog_widgets.html
+++ b/tests/visual/compound/dialog_widgets.html
@@ -5,26 +5,10 @@
<title>Compound Visual Test : All Widgets in Dialog</title>
<link rel="stylesheet" href="../visual.css">
<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/position.js"></script>
- <script src="../../../ui/menu.js"></script>
- <script src="../../../ui/resizable.js"></script>
- <script src="../../../ui/draggable.js"></script>
- <script src="../../../ui/accordion.js"></script>
- <script src="../../../ui/autocomplete.js"></script>
- <script src="../../../ui/button.js"></script>
- <script src="../../../ui/datepicker.js"></script>
- <script src="../../../ui/dialog.js"></script>
- <script src="../../../ui/progressbar.js"></script>
- <script src="../../../ui/slider.js"></script>
- <script src="../../../ui/tabs.js"></script>
- <script src="../../../ui/tooltip.js"></script>
- <script src="../../../ui/selectmenu.js"></script>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js"
+ data-modules="accordion autocomplete button datepicker dialog progressbar slider tabs tooltip selectmenu"
+ data-composite="true">
$( "#dialog" ).dialog();
$( "[title]" ).tooltip();
$( "#accordion" ).accordion();
@@ -54,7 +38,6 @@
height: 75,
modal: true
});
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/draggable_accordion.html b/tests/visual/compound/draggable_accordion.html
index 528cdc321..345c0b038 100644
--- a/tests/visual/compound/draggable_accordion.html
+++ b/tests/visual/compound/draggable_accordion.html
@@ -5,20 +5,15 @@
<title>Compound Visual Test : Draggable in Accordion</title>
<link rel="stylesheet" href="../visual.css">
<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/accordion.js"></script>
- <script src="../../../ui/draggable.js"></script>
<style>
.draggable {
width: 10em;
margin: 0.5em;
}
</style>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="accordion draggable"
+ data-composite="true">
$( ".draggable" ).addClass( "ui-widget ui-widget-content ui-corner-all" )
$( "#first .draggable" ).draggable();
$( "#second .draggable" ).draggable({
@@ -29,7 +24,6 @@
appendTo: "body"
});
$( "#accordion" ).accordion();
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html b/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
index 302a2e910..bfc5f81e6 100644
--- a/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
+++ b/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
@@ -5,13 +5,6 @@
<title>Compound Visual Test : Draggable in Accordion</title>
<link rel="stylesheet" href="../visual.css">
<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/accordion.js"></script>
- <script src="../../../ui/draggable.js"></script>
- <script src="../../../ui/tabs.js"></script>
<style>
#main-draggable {
width: 300px;
@@ -27,8 +20,9 @@
margin: 0.5em;
}
</style>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="accordion draggable tabs"
+ data-composite="true">
$( ".draggable" )
.addClass( "ui-widget ui-widget-content ui-corner-all" )
.draggable({
@@ -44,7 +38,6 @@
$( "#main-draggable" ).draggable({
handle: "#main-draggable-handle"
});
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/draggable_resizable.html b/tests/visual/compound/draggable_resizable.html
index d07c8bdc4..539091b7f 100644
--- a/tests/visual/compound/draggable_resizable.html
+++ b/tests/visual/compound/draggable_resizable.html
@@ -5,12 +5,6 @@
<title>Compound Visual Test: Draggable and Resizable block element</title>
<link rel="stylesheet" href="../visual.css">
<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/resizable.js"></script>
<style>
.draggable {
margin: 0.5em;
@@ -21,8 +15,9 @@
position: absolute !important;
}
</style>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="draggable resizable"
+ data-composite="true">
$( ".draggable" )
.addClass( "ui-widget ui-widget-header ui-corner-all" )
.draggable({
@@ -33,7 +28,6 @@
handles: "s"
});
$( ".draggable:last" ).addClass( "absolute" );
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/sortable_accordion_sortable_tabs.html b/tests/visual/compound/sortable_accordion_sortable_tabs.html
index f44f2b929..9ccc36751 100644
--- a/tests/visual/compound/sortable_accordion_sortable_tabs.html
+++ b/tests/visual/compound/sortable_accordion_sortable_tabs.html
@@ -5,15 +5,9 @@
<title>Compound Visual Test : Accordion in Tabs</title>
<link rel="stylesheet" href="../visual.css">
<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/sortable.js"></script>
- <script src="../../../ui/accordion.js"></script>
- <script src="../../../ui/tabs.js"></script>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="accordion tabs sortable"
+ data-composite="true">
$( "#accordion-1, #accordion-2" )
.accordion({
header: "> div > h3"
@@ -24,7 +18,6 @@
.tabs()
.find( ".ui-tabs-nav" )
.sortable();
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/tabs_selectmenu.html b/tests/visual/compound/tabs_selectmenu.html
index ca2020b71..ddd72c75f 100644
--- a/tests/visual/compound/tabs_selectmenu.html
+++ b/tests/visual/compound/tabs_selectmenu.html
@@ -5,18 +5,10 @@
<title>Compound Visual Test : Selectmenu in Tabs</title>
<link rel="stylesheet" href="../visual.css">
<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 src="../../../ui/selectmenu.js"></script>
- <script src="../../../ui/tabs.js"></script>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="tabs selectmenu" data-composite="true">
$( "#tabs" ).tabs();
$( "select" ).selectmenu();
- });
</script>
<style>
select { width: 200px; }
diff --git a/tests/visual/compound/tabs_tabs.html b/tests/visual/compound/tabs_tabs.html
index bf5cf4ead..54c2d48a1 100644
--- a/tests/visual/compound/tabs_tabs.html
+++ b/tests/visual/compound/tabs_tabs.html
@@ -5,15 +5,9 @@
<title>Compound Visual Test : Tabs in Tabs</title>
<link rel="stylesheet" href="../visual.css">
<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/accordion.js"></script>
- <script src="../../../ui/tabs.js"></script>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="tabs" data-composite="true">
$( "#tabs, #tabs-a, #tabs-b" ).tabs();
- });
</script>
</head>
<body>
diff --git a/tests/visual/compound/tabs_tooltips.html b/tests/visual/compound/tabs_tooltips.html
index bb8f2d11d..8ee625e1e 100644
--- a/tests/visual/compound/tabs_tooltips.html
+++ b/tests/visual/compound/tabs_tooltips.html
@@ -5,17 +5,10 @@
<title>Compound Visual Test : Tabs in Tabs</title>
<link rel="stylesheet" href="../visual.css">
<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/tabs.js"></script>
- <script>
- $(function() {
+ <script src="../../../external/requirejs/require.js"></script>
+ <script src="../../../demos/bootstrap.js" data-modules="tabs tooltip" data-composite="true">
$( "#tabs" ).tabs();
$( "a" ).tooltip();
- });
</script>
</head>
<body>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 23:49:45 +0000