Skip to content

Commit fa44e51

Browse files
scottgonzalezscottgonzalez
committed
Compound visual tests: Cleanup.
1 parent 730e345 commit fa44e51

10 files changed

+231
-685
lines changed

‎tests/visual/compound/accordion_dialog.html‎

Lines changed: 0 additions & 203 deletions
This file was deleted.

‎tests/visual/compound/accordion_tabs.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
4+
<meta charset="utf-8">
55
<title>Compound Visual Test : Accordion in Tabs</title>
6-
<link rel="stylesheet" href="../visual.css" type="text/css" />
7-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
8-
<script type="text/javascript" src="../../../jquery-1.7.2.js"></script>
9-
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
10-
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
11-
<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
12-
<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
13-
<script type="text/javascript">
6+
<link rel="stylesheet" href="../visual.css">
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
8+
<script src="../../../jquery-1.7.2.js"></script>
9+
<script src="../../../ui/jquery.ui.core.js"></script>
10+
<script src="../../../ui/jquery.ui.widget.js"></script>
11+
<script src="../../../ui/jquery.ui.accordion.js"></script>
12+
<script src="../../../ui/jquery.ui.tabs.js"></script>
13+
<script>
1414
$(function() {
15-
$('#tabs').tabs();
16-
$('#accordion-1, #accordion-2').accordion();
15+
$( "#accordion-1, #accordion-2" ).accordion();
16+
$( "#tabs" ).tabs();
1717
});
1818
</script>
1919
</head>
@@ -26,23 +26,23 @@
2626
</ul>
2727
<div id="tabs-1">
2828
<div id="accordion-1">
29-
<h3><a href="#">Accordion Header 1</a></h3>
29+
<h3>Accordion Header 1</h3>
3030
<div>
3131
<p>Accordion Content 1</p>
3232
<p>Accordion Content 1</p>
3333
<p>Accordion Content 1</p>
3434
<p>Accordion Content 1</p>
3535
<p>Accordion Content 1</p>
3636
</div>
37-
<h3><a href="#">Accordion Header 2</a></h3>
37+
<h3>Accordion Header 2</h3>
3838
<div>
3939
<p>Accordion Content 2</p>
4040
<p>Accordion Content 2</p>
4141
<p>Accordion Content 2</p>
4242
<p>Accordion Content 2</p>
4343
<p>Accordion Content 2</p>
4444
</div>
45-
<h3><a href="#">Accordion Header 3</a></h3>
45+
<h3>Accordion Header 3</h3>
4646
<div>
4747
<p>Accordion Content 3</p>
4848
<p>Accordion Content 3</p>
@@ -54,23 +54,23 @@ <h3><a href="#">Accordion Header 3</a></h3>
5454
</div>
5555
<div id="tabs-2">
5656
<div id="accordion-2">
57-
<h3><a href="#">Accordion Header 1</a></h3>
57+
<h3>Accordion Header 1</h3>
5858
<div>
5959
<p>Accordion Content 1</p>
6060
<p>Accordion Content 1</p>
6161
<p>Accordion Content 1</p>
6262
<p>Accordion Content 1</p>
6363
<p>Accordion Content 1</p>
6464
</div>
65-
<h3><a href="#">Accordion Header 2</a></h3>
65+
<h3>Accordion Header 2</h3>
6666
<div>
6767
<p>Accordion Content 2</p>
6868
<p>Accordion Content 2</p>
6969
<p>Accordion Content 2</p>
7070
<p>Accordion Content 2</p>
7171
<p>Accordion Content 2</p>
7272
</div>
73-
<h3><a href="#">Accordion Header 3</a></h3>
73+
<h3>Accordion Header 3</h3>
7474
<div>
7575
<p>Accordion Content 3</p>
7676
<p>Accordion Content 3</p>

‎tests/visual/compound/datepicker_dialog.html‎

Lines changed: 16 additions & 143 deletions
Large diffs are not rendered by default.

‎tests/visual/compound/dialog_widgets.html‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Compound Visual Test : All Widgets in Dialog</title>
6+
<link rel="stylesheet" href="../visual.css">
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
8+
<script src="../../../jquery-1.7.2.js"></script>
9+
<script src="../../../ui/jquery.ui.core.js"></script>
10+
<script src="../../../ui/jquery.ui.widget.js"></script>
11+
<script src="../../../ui/jquery.ui.mouse.js"></script>
12+
<script src="../../../ui/jquery.ui.position.js"></script>
13+
<script src="../../../ui/jquery.ui.menu.js"></script>
14+
<script src="../../../ui/jquery.ui.resizable.js"></script>
15+
<script src="../../../ui/jquery.ui.draggable.js"></script>
16+
<script src="../../../ui/jquery.ui.accordion.js"></script>
17+
<script src="../../../ui/jquery.ui.autocomplete.js"></script>
18+
<script src="../../../ui/jquery.ui.button.js"></script>
19+
<script src="../../../ui/jquery.ui.datepicker.js"></script>
20+
<script src="../../../ui/jquery.ui.dialog.js"></script>
21+
<script src="../../../ui/jquery.ui.progressbar.js"></script>
22+
<script src="../../../ui/jquery.ui.slider.js"></script>
23+
<script src="../../../ui/jquery.ui.tabs.js"></script>
24+
<script src="../../../ui/jquery.ui.tooltip.js"></script>
25+
<script>
26+
$(function() {
27+
$( "[title]" ).tooltip();
28+
$( "#accordion" ).accordion();
29+
$( "#autocomplete" ).autocomplete({
30+
source: [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl" ]
31+
});
32+
$( "button" ).button().click(function() {
33+
$( "#dialog2" ).dialog( "open" );
34+
});
35+
$( "#datepicker" ).datepicker();
36+
$( "#progressbar" ).progressbar({
37+
value: 30
38+
});
39+
$( "#slider" ).slider({
40+
animate: true,
41+
value: 30,
42+
slide: function(event, ui) {
43+
$( "#progress" ).val( ui.value );
44+
$( "#progressbar" ).progressbar( "option", "value", ui.value );
45+
}
46+
});
47+
$( "#tabs" ).tabs();
48+
$( "#dialog" ).dialog();
49+
$( "#dialog2" ).dialog({
50+
autoOpen: false,
51+
width: 100,
52+
height: 75,
53+
modal: true
54+
});
55+
});
56+
</script>
57+
</head>
58+
<body>
59+
60+
<div id="dialog">
61+
<div id="accordion">
62+
<h3>Accordion Header 1</h3>
63+
<div>
64+
Accordion Content 1
65+
</div>
66+
<h3>Accordion Header 2</h3>
67+
<div>
68+
Accordion Content 2
69+
</div>
70+
<h3>Accordion Header 3</h3>
71+
<div>
72+
Accordion Content 3
73+
</div>
74+
</div>
75+
<input id="autocomplete">
76+
<button>A Button</button>
77+
<input id="datepicker">
78+
<button>Another button</button>
79+
<div>
80+
<label for="progress">Progress: <input title="The progress we made so far" id="progress"></label>
81+
</div>
82+
<div id="progressbar">
83+
</div>
84+
<div id="slider" title="Sliding progress..."></div>
85+
<div id="tabs">
86+
<ul>
87+
<li><a href="#tabs-1">First</a></li>
88+
<li><a href="#tabs-2">Second</a></li>
89+
<li><a href="#tabs-3">Third</a></li>
90+
</ul>
91+
<div id="tabs-1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
92+
<div id="tabs-2">Phasellus mattis tincidunt nibh.</div>
93+
<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
94+
</div>
95+
</div>
96+
<div id="dialog2">
97+
Yay, another dialog.
98+
</div>
99+
100+
</body>
101+
</html>

‎tests/visual/compound/draggable_accordion.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
4+
<meta charset="utf-8">
55
<title>Compound Visual Test : Draggable in Accordion</title>
6-
<link rel="stylesheet" href="../visual.css" type="text/css" />
7-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
8-
<script type="text/javascript" src="../../../jquery-1.7.2.js"></script>
9-
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
10-
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
11-
<script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script>
12-
<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
13-
<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
14-
<style type="text/css">
6+
<link rel="stylesheet" href="../visual.css">
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
8+
<script src="../../../jquery-1.7.2.js"></script>
9+
<script src="../../../ui/jquery.ui.core.js"></script>
10+
<script src="../../../ui/jquery.ui.widget.js"></script>
11+
<script src="../../../ui/jquery.ui.mouse.js"></script>
12+
<script src="../../../ui/jquery.ui.accordion.js"></script>
13+
<script src="../../../ui/jquery.ui.draggable.js"></script>
14+
<style>
1515
.draggable {
1616
width: 10em;
1717
margin: 0.5em;
1818
}
1919
</style>
20-
<script type="text/javascript">
20+
<script>
2121
$(function() {
22-
$( "#accordion" ).accordion();
2322
$( ".draggable" ).addClass( "ui-widget ui-widget-content ui-corner-all" )
2423
$( "#first .draggable" ).draggable();
2524
$( "#second .draggable" ).draggable({
@@ -29,29 +28,30 @@
2928
helper: "clone",
3029
appendTo: "body"
3130
});
31+
$( "#accordion" ).accordion();
3232
});
3333
</script>
3434
</head>
3535
<body>
3636

3737
<div id="accordion">
38-
<h3><a href="#">.draggable()</a></h3>
38+
<h3>.draggable()</h3>
3939
<div id="first">
4040
<div class="draggable">Draggable 1-1</div>
4141
<div class="draggable">Draggable 1-2</div>
4242
<div class="draggable">Draggable 1-3</div>
4343
<div class="draggable">Draggable 1-4</div>
4444
<div class="draggable">Draggable 1-5</div>
4545
</div>
46-
<h3><a href="#">.draggable({ appendTo: "body" })</a></h3>
46+
<h3>.draggable({ appendTo: "body" })</h3>
4747
<div id="second">
4848
<div class="draggable">Draggable 2-1</div>
4949
<div class="draggable">Draggable 2-2</div>
5050
<div class="draggable">Draggable 2-3</div>
5151
<div class="draggable">Draggable 2-4</div>
5252
<div class="draggable">Draggable 2-5</div>
5353
</div>
54-
<h3><a href="#">.draggable({ helper: "clone", appendTo: "body" })</a></h3>
54+
<h3>.draggable({ helper: "clone", appendTo: "body" })</h3>
5555
<div id="third">
5656
<div class="draggable">Draggable 3-1</div>
5757
<div class="draggable">Draggable 3-2</div>

‎tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
4+
<meta charset="utf-8">
55
<title>Compound Visual Test : Draggable in Accordion</title>
6-
<link rel="stylesheet" href="../visual.css" type="text/css" />
7-
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
8-
<script type="text/javascript" src="../../../jquery-1.7.2.js"></script>
9-
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
10-
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
11-
<script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script>
12-
<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
13-
<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
14-
<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
15-
<style type="text/css">
6+
<link rel="stylesheet" href="../visual.css">
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
8+
<script src="../../../jquery-1.7.2.js"></script>
9+
<script src="../../../ui/jquery.ui.core.js"></script>
10+
<script src="../../../ui/jquery.ui.widget.js"></script>
11+
<script src="../../../ui/jquery.ui.mouse.js"></script>
12+
<script src="../../../ui/jquery.ui.accordion.js"></script>
13+
<script src="../../../ui/jquery.ui.draggable.js"></script>
14+
<script src="../../../ui/jquery.ui.tabs.js"></script>
15+
<style>
1616
#main-draggable {
1717
width: 300px;
1818
position: absolute;
@@ -27,22 +27,20 @@
2727
margin: 0.5em;
2828
}
2929
</style>
30-
<script type="text/javascript">
30+
<script>
3131
$(function() {
32-
$( ".draggable" ).addClass( "ui-widget ui-widget-content ui-corner-all" )
33-
$( ".draggable" ).draggable({
34-
helper: "clone",
35-
appendTo: "body"
36-
});
37-
38-
// PROBLEM: nested accordions must be initialized before outer accordion
32+
$( ".draggable" )
33+
.addClass( "ui-widget ui-widget-content ui-corner-all" )
34+
.draggable({
35+
helper: "clone",
36+
appendTo: "body"
37+
});
38+
3939
$( "#accordion > div" ).accordion();
4040
$( "#accordion" ).accordion();
41-
42-
43-
// PROBLEM: nested widgets must be initialized before tabs
41+
4442
$( "#tabs" ).tabs();
45-
43+
4644
$( "#main-draggable" ).draggable({
4745
handle: "#main-draggable-handle"
4846
});
@@ -62,17 +60,17 @@
6260
</div>
6361
<div id="tabs-2">
6462
<div id="accordion">
65-
<h3><a>Accordion Group 1</a></h3>
63+
<h3>Accordion Group 1</h3>
6664
<div id="accordion-1-1">
67-
<h3><a href="#">Header 1-1</a></h3>
65+
<h3>Header 1-1</h3>
6866
<div>
6967
<div class="draggable">Draggable 1-1</div>
7068
<div class="draggable">Draggable 1-2</div>
7169
<div class="draggable">Draggable 1-3</div>
7270
<div class="draggable">Draggable 1-4</div>
7371
<div class="draggable">Draggable 1-5</div>
7472
</div>
75-
<h3><a href="#">Header 1-2</a></h3>
73+
<h3>Header 1-2</h3>
7674
<div>
7775
<div class="draggable">Draggable 2-1</div>
7876
<div class="draggable">Draggable 2-2</div>
@@ -81,17 +79,17 @@ <h3><a href="#">Header 1-2</a></h3>
8179
<div class="draggable">Draggable 2-5</div>
8280
</div>
8381
</div>
84-
<h3><a>Accordion Group 2</a></h3>
82+
<h3>Accordion Group 2</h3>
8583
<div id="accordion-1-2">
86-
<h3><a href="#">Header 2-1</a></h3>
84+
<h3>Header 2-1</h3>
8785
<div>
8886
<div class="draggable">Draggable 1-1</div>
8987
<div class="draggable">Draggable 1-2</div>
9088
<div class="draggable">Draggable 1-3</div>
9189
<div class="draggable">Draggable 1-4</div>
9290
<div class="draggable">Draggable 1-5</div>
9391
</div>
94-
<h3><a href="#">Header 2-2</a></h3>
92+
<h3>Header 2-2</h3>
9593
<div>
9694
<div class="draggable">Draggable 2-1</div>
9795
<div class="draggable">Draggable 2-2</div>

0 commit comments

Comments
 (0)