Skip to content

Commit 0a6b126

Browse files
committed
Fix various issues in our html files, fourth batch
1 parent d40993d commit 0a6b126

9 files changed

Lines changed: 53 additions & 101 deletions

tests/visual/button/button_ticket_5254.html

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

tests/visual/compound/accordion_dialog.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ <h3><a href="#">Section 3</a></h3>
134134
</p>
135135
<p>
136136
Cras a augue dui, vitae tincidunt enim. In hac habitasse platea dictumst. Proin nec magna sed nulla mollis tempus id ut lectus. Morbi volutpat ultricies ipsum, quis imperdiet libero tempor nec. Donec bibendum ornare blandit. Aliquam rutrum risus non turpis commodo non commodo erat molestie. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fermentum, magna vel euismod convallis, mi magna vehicula velit, aliquet rhoncus ipsum massa et nunc. Nullam blandit purus non neque ullamcorper a aliquet nisl tristique. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed sit amet velit magna, sit amet rutrum dui. Donec elementum mi sed velit consectetur vulputate. Sed interdum adipiscing mattis.
137-
</p>
137+
</p>
138+
<p>
138139
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae urna quam. Fusce adipiscing erat eget magna malesuada vel mollis ligula ullamcorper. Donec pulvinar, libero et vehicula facilisis, odio orci fringilla magna, non ultricies ipsum justo a tellus. Proin facilisis magna vitae quam vestibulum tempor. Aenean semper placerat posuere. In nisi diam, ullamcorper sit amet viverra sed, pretium sed neque. Sed posuere vulputate mauris vitae placerat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam in odio elit, non tempor felis. Integer non iaculis ante. Sed erat mauris, aliquam nec consequat id, congue id libero. Maecenas elementum gravida tincidunt. Suspendisse lacinia enim sit amet nulla cursus pulvinar.
139140
</p>
140141
<p>

tests/visual/compound/datepicker_dialog.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@
8989
</p>
9090
<p>
9191
Cras a augue dui, vitae tincidunt enim. In hac habitasse platea dictumst. Proin nec magna sed nulla mollis tempus id ut lectus. Morbi volutpat ultricies ipsum, quis imperdiet libero tempor nec. Donec bibendum ornare blandit. Aliquam rutrum risus non turpis commodo non commodo erat molestie. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fermentum, magna vel euismod convallis, mi magna vehicula velit, aliquet rhoncus ipsum massa et nunc. Nullam blandit purus non neque ullamcorper a aliquet nisl tristique. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed sit amet velit magna, sit amet rutrum dui. Donec elementum mi sed velit consectetur vulputate. Sed interdum adipiscing mattis.
92-
</p>
92+
</p>
93+
<p>
9394
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae urna quam. Fusce adipiscing erat eget magna malesuada vel mollis ligula ullamcorper. Donec pulvinar, libero et vehicula facilisis, odio orci fringilla magna, non ultricies ipsum justo a tellus. Proin facilisis magna vitae quam vestibulum tempor. Aenean semper placerat posuere. In nisi diam, ullamcorper sit amet viverra sed, pretium sed neque. Sed posuere vulputate mauris vitae placerat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam in odio elit, non tempor felis. Integer non iaculis ante. Sed erat mauris, aliquam nec consequat id, congue id libero. Maecenas elementum gravida tincidunt. Suspendisse lacinia enim sit amet nulla cursus pulvinar.
9495
</p>
9596
<p>

tests/visual/compound/sortable_accordion_sortable_tabs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ <h3><a href="#">Accordion Header 3</a></h3>
6969
</div>
7070
</div>
7171
<div id="tabs-2">
72-
<div id="accordion-1">
72+
<div id="accordion-2">
7373
<div>
7474
<h3><a href="#">Accordion Header 1</a></h3>
7575
<div>

tests/visual/compound/widgets_in_dialog.html

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
4+
<meta charset="utf-8">
55
<title>Compound Visual Test : All Widgets in Dialog</title>
66
<link rel="stylesheet" href="../visual.css" type="text/css" />
77
<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.position.js"></script>
13-
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
14-
<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
15-
<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
16-
<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
17-
<script type="text/javascript" src="../../../ui/jquery.ui.autocomplete.js"></script>
18-
<script type="text/javascript" src="../../../ui/jquery.ui.button.js"></script>
19-
<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
20-
<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
21-
<script type="text/javascript" src="../../../ui/jquery.ui.progressbar.js"></script>
22-
<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
23-
<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
24-
<script type="text/javascript" src="../../../ui/jquery.ui.tooltip.js"></script>
25-
<script type="text/javascript">
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>
2626
$(function() {
2727
$("[title]").tooltip();
28-
28+
2929
$("#accordion").accordion();
3030
$("#autocomplete").autocomplete({
3131
source: ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl"]
@@ -47,7 +47,7 @@
4747
}
4848
});
4949
$("#tabs").tabs();
50-
50+
5151
$("#dialog").dialog();
5252
$("#dialog2").dialog({
5353
autoOpen: false,
@@ -100,6 +100,7 @@ <h3><a href="#">Accordion Header 3</a></h3>
100100
Yay, another dialog.
101101
</div>
102102

103+
<p>
103104
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae urna quam. Fusce adipiscing erat eget magna malesuada vel mollis ligula ullamcorper. Donec pulvinar, libero et vehicula facilisis, odio orci fringilla magna, non ultricies ipsum justo a tellus. Proin facilisis magna vitae quam vestibulum tempor. Aenean semper placerat posuere. In nisi diam, ullamcorper sit amet viverra sed, pretium sed neque. Sed posuere vulputate mauris vitae placerat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam in odio elit, non tempor felis. Integer non iaculis ante. Sed erat mauris, aliquam nec consequat id, congue id libero. Maecenas elementum gravida tincidunt. Suspendisse lacinia enim sit amet nulla cursus pulvinar.
104105
</p>
105106
<p>
@@ -162,6 +163,7 @@ <h3><a href="#">Accordion Header 3</a></h3>
162163
<p>
163164
Cras a augue dui, vitae tincidunt enim. In hac habitasse platea dictumst. Proin nec magna sed nulla mollis tempus id ut lectus. Morbi volutpat ultricies ipsum, quis imperdiet libero tempor nec. Donec bibendum ornare blandit. Aliquam rutrum risus non turpis commodo non commodo erat molestie. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fermentum, magna vel euismod convallis, mi magna vehicula velit, aliquet rhoncus ipsum massa et nunc. Nullam blandit purus non neque ullamcorper a aliquet nisl tristique. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed sit amet velit magna, sit amet rutrum dui. Donec elementum mi sed velit consectetur vulputate. Sed interdum adipiscing mattis.
164165
</p>
166+
<p>
165167
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae urna quam. Fusce adipiscing erat eget magna malesuada vel mollis ligula ullamcorper. Donec pulvinar, libero et vehicula facilisis, odio orci fringilla magna, non ultricies ipsum justo a tellus. Proin facilisis magna vitae quam vestibulum tempor. Aenean semper placerat posuere. In nisi diam, ullamcorper sit amet viverra sed, pretium sed neque. Sed posuere vulputate mauris vitae placerat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam in odio elit, non tempor felis. Integer non iaculis ante. Sed erat mauris, aliquam nec consequat id, congue id libero. Maecenas elementum gravida tincidunt. Suspendisse lacinia enim sit amet nulla cursus pulvinar.
166168
</p>
167169
<p>

tests/visual/effects/effects.scale.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<script src="../../../ui/jquery.effects.core.js"></script>
99
<script src="../../../ui/jquery.effects.scale.js"></script>
1010
<script src="effects.all.js"></script>
11-
<script type="text/javascript" charset="utf-8">
11+
<script>
1212
jQuery(function( $ ) {
1313
var test = $( "#testBox" ),
1414
opts = $( ".arg" ),
@@ -36,9 +36,9 @@
3636
var cur = this.selectedIndex,
3737
next = cur + direction,
3838
len = this.options.length;
39-
39+
4040
this.selectedIndex = ( next + len ) % len;
41-
41+
4242
if ( ( next+len ) % len === next ) return false;
4343
});
4444
doAnim();

tests/visual/menu/drilldown.html

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!doctype html>
22
<html>
33
<head>
4+
<meta charset="utf-8">
45
<title>Menu Visual Test: Default</title>
56
<link rel="stylesheet" href="../visual.css" type="text/css" />
67
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
@@ -18,15 +19,15 @@
1819
right: 10,
1920
top: 10
2021
}).appendTo(document.body).themeswitcher();
21-
22+
2223
$.widget("ui.drilldown", {
2324
_init: function() {
2425
var that = this;
2526
this.active = this.element.find(">ul").attr("tabindex", 0);
26-
27+
2728
// hide submenus and create indicator icons
28-
this.element.find("ul").hide().prev("a").prepend('<span class="ui-icon ui-icon-carat-1-e"></span>').end().filter(":first").show();
29-
29+
this.element.find("ul").hide().prev("a").prepend('<span class="ui-icon ui-icon-carat-1-e"></span>').end().filter(":first").show();
30+
3031
this.element.find("ul").menu({
3132
// disable built-in key handling
3233
input: $(),
@@ -46,7 +47,7 @@
4647
}
4748
}
4849
});
49-
50+
5051
this.back = this.element.children(":last").button({
5152
icons: {
5253
primary: "ui-icon-carat-1-w"
@@ -56,7 +57,7 @@
5657
return false;
5758
}).hide();
5859
},
59-
60+
6061
_open: function(submenu) {
6162
this.active = submenu.show().css({
6263
opacity: 0
@@ -78,7 +79,7 @@
7879
});
7980
this.back.show();
8081
},
81-
82+
8283
up: function() {
8384
if (this.active.parent()[0] == this.element[0]) {
8485
return;
@@ -101,32 +102,32 @@
101102
this.back.hide();
102103
}
103104
},
104-
105+
105106
down: function(event) {
106107
var nested = this.activeItem.find(">ul");
107108
if (nested.length) {
108109
this._open(nested);
109110
nested.menu("focus", event, nested.children(":first"))
110111
}
111112
},
112-
113+
113114
show: function() {
114115
},
115-
116+
116117
hide: function() {
117118
},
118-
119+
119120
widget: function() {
120121
return this.element.find(">ul");
121122
}
122123
});
123-
124+
124125
var drilldown = $("#drilldown").drilldown({
125126
select: function(event, ui) {
126127
$("#log").append("<div>Selected " + ui.item.text() + "</div>");
127128
}
128129
});
129-
130+
130131
drilldown.drilldown("widget").keydown(function(event) {
131132
var menu = drilldown.data("drilldown").active.data("menu");
132133
if (menu.widget().is(":hidden"))
@@ -171,7 +172,7 @@
171172
} else {
172173
character = prev + character;
173174
}
174-
175+
175176
var match = menu.widget().children("li").filter(function() {
176177
return new RegExp("^" + character, "i").test($("a", this).text());
177178
});
@@ -207,7 +208,7 @@
207208
</style>
208209
</head>
209210
<body>
210-
211+
211212
<div id="drilldown">
212213
<h3>Make a selection...</h3>
213214
<ul>

tests/visual/menu/menu.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!doctype html>
22
<html>
33
<head>
4+
<meta charset="utf-8">
45
<title>Menu Visual Test: Default</title>
56
<link rel="stylesheet" href="../visual.css" type="text/css" />
67
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
@@ -38,7 +39,7 @@
3839
menus: ".menuElement"
3940
});
4041
}
41-
42+
4243
var menus = $("#menu1, #menu2, #menu3, .menu4");
4344
create();
4445

tests/visual/menu/tablemenu.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!doctype html>
22
<html>
33
<head>
4+
<meta charset="utf-8">
45
<title>Menu Visual Test: Default</title>
56
<link rel="stylesheet" href="../visual.css" type="text/css" />
67
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
@@ -20,7 +21,7 @@
2021
rows.each(function() {
2122
$("<table>").width("100%").append(colgroup.clone()).append(this).wrap("<li><a></a></li>").parent().parent().appendTo(menu);
2223
});
23-
24+
2425
menu.menu({
2526
select: function(event, ui) {
2627
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
@@ -34,7 +35,7 @@
3435
</style>
3536
</head>
3637
<body>
37-
38+
3839
<table>
3940
<colgroup><col style="width: 50%"><col style="width: 50%"></colgroup>
4041
<thead>
@@ -54,7 +55,7 @@
5455
</tr>
5556
</tbody>
5657
</table>
57-
58+
5859
<div class="ui-widget" style="clear: left; margin-top:2em; font-family:Arial">
5960
Log:
6061
<div id="log" style="height: 400px; width: 300px; overflow: auto;" class="ui-widget-content"></div>

0 commit comments

Comments
 (0)