Skip to content

Commit d40993d

Browse files
committed
Fix various issues in our html files, third batch
1 parent 22edb77 commit d40993d

File tree

3 files changed

+49
-55
lines changed

3 files changed

+49
-55
lines changed

tests/static/datepicker/datepicker.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@
9090
</tbody>
9191
</table>
9292
</div>
93-
93+
9494
<!-- Datepicker with 1 combined select -->
9595
<div class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all">
9696
<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix ui-corner-all">
9797
<a title="Prev" class="ui-datepicker-prev ui-corner-all" href="#"><span class="ui-icon ui-icon-circle-triangle-w">Prev</span></a>
9898
<a title="Next" class="ui-datepicker-next ui-corner-all" href="#"><span class="ui-icon ui-icon-circle-triangle-e">Next</span></a>
9999
<div class="ui-datepicker-title">
100100
<select class="ui-datepicker-month-year">
101-
<optgroup name="2007">
101+
<optgroup label="2007">
102102
<option value="2007_0">January 2007</option>
103103
<option value="2007_1">February 2007</option>
104104
<option value="2007_2">March 2007</option>
@@ -112,7 +112,7 @@
112112
<option value="2007_10">November 2007</option>
113113
<option value="2007_11">December 2007</option>
114114
</optgroup>
115-
<optgroup name="2008">
115+
<optgroup label="2008">
116116
<option value="2008_0">January 2008</option>
117117
<option value="2008_1">February 2008</option>
118118
<option value="2008_2">March 2008</option>
@@ -126,7 +126,7 @@
126126
<option value="2008_10">November 2008</option>
127127
<option selected="selected" value="2008_11">December 2008</option>
128128
</optgroup>
129-
<optgroup name="2009">
129+
<optgroup label="2009">
130130
<option value="2009_0">January 2009</option>
131131
<option value="2009_1">February 2009</option>
132132
<option value="2009_2">March 2009</option>
@@ -140,7 +140,7 @@
140140
<option value="2009_10">November 2009</option>
141141
<option value="2009_11">December 2009</option>
142142
</optgroup>
143-
<optgroup name="2010">
143+
<optgroup label="2010">
144144
<option value="2010_0">January 2010</option>
145145
<option value="2010_1">February 2010</option>
146146
<option value="2010_2">March 2010</option>
@@ -430,11 +430,11 @@
430430
<td class="ui-datepicker-week-end ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"></td>
431431
</tr>
432432
</tbody>
433-
</table>
433+
</table>
434434
<div class="ui-datepicker-buttonpane ui-widget-content">
435435
<button class="ui-state-default ui-priority-primary ui-corner-all">Done</button>
436436
<button class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all">Today</button>
437-
</div>
437+
</div>
438438
</div>
439439

440440
<!-- Multiple Datepickers with read only month/year -->
@@ -649,7 +649,7 @@
649649
</td></tr>
650650
</tbody>
651651
</table>
652-
</div>
652+
</div>
653653
<div class="ui-datepicker-group ui-datepicker-group-middle">
654654
<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
655655
<div class="ui-datepicker-title">
@@ -863,7 +863,7 @@
863863
</td></tr>
864864
</tbody>
865865
</table>
866-
</div>
866+
</div>
867867
<div class="ui-datepicker-group ui-datepicker-group-middle">
868868
<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
869869
<div class="ui-datepicker-title">
@@ -924,7 +924,7 @@
924924
<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">23</a></td>
925925
<td class=""><a href="#" class="ui-state-default">24</a></td>
926926
<td class=""><a href="#" class="ui-state-default">25</a></td>
927-
<td class=""><a href="#" class="ui-state-default">26</a></td>
927+
<td class=""><a href="#" class="ui-state-default">26</a></td>
928928
<td class=""><a href="#" class="ui-state-default">27</a></td>
929929
<td class=""><a href="#" class="ui-state-default">28</a></td>
930930
<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">29</a></td>
@@ -1077,8 +1077,8 @@
10771077
</td></tr>
10781078
</tbody>
10791079
</table>
1080-
</div>
1081-
1080+
</div>
1081+
10821082
<div class="ui-datepicker-row-break"></div>
10831083
<div class="ui-datepicker-group ui-datepicker-group-first">
10841084
<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
@@ -1344,7 +1344,7 @@
13441344
<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">23</a></td>
13451345
<td class=""><a href="#" class="ui-state-default">24</a></td>
13461346
<td class=""><a href="#" class="ui-state-default">25</a></td>
1347-
<td class=""><a href="#" class="ui-state-default">26</a></td>
1347+
<td class=""><a href="#" class="ui-state-default">26</a></td>
13481348
<td class=""><a href="#" class="ui-state-default">27</a></td>
13491349
<td class=""><a href="#" class="ui-state-default">28</a></td>
13501350
<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">29</a></td>

tests/unit/core/core.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ <h2 id="qunit-userAgent"></h2>
3939

4040
<img src="../images/jqueryui_32x32.png" usemap="#mymap" width="10" height="10" alt="">
4141
<map name="mymap">
42-
<area shape="rect" coords="0,0,1,1" id="areaCoordsNoHref" alt="">
4342
<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaCoordsHref" alt="">
44-
<area shape="rect" coords="0,0,0,0" href="foo.html" id="areaCoordsNoSizeHref" alt="">
4543
<area href="foo.html" id="areaNoCoordsHref" alt="">
4644
</map>
4745
<map name="mymap2">

tests/unit/core/selector.js

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,81 +6,81 @@
66
module("core - selectors");
77

88
function isFocusable(selector, msg) {
9-
ok($(selector).is(':focusable'), msg + " - selector " + selector + " is focusable");
9+
QUnit.push($(selector).is(':focusable'), null, null, msg + " - selector " + selector + " is focusable");
1010
}
1111

1212
function isNotFocusable(selector, msg) {
13-
ok($(selector).length && !$(selector).is(':focusable'), msg + " - selector " + selector + " is not focusable");
13+
QUnit.push($(selector).length && !$(selector).is(':focusable'), null, null, msg + " - selector " + selector + " is not focusable");
1414
}
1515

1616
function isTabbable(selector, msg) {
17-
ok($(selector).is(':tabbable'), msg + " - selector " + selector + " is tabbable");
17+
QUnit.push($(selector).is(':tabbable'), null, null, msg + " - selector " + selector + " is tabbable");
1818
}
1919

2020
function isNotTabbable(selector, msg) {
21-
ok($(selector).length && !$(selector).is(':tabbable'), msg + " - selector " + selector + " is not tabbable");
21+
QUnit.push($(selector).length && !$(selector).is(':tabbable'), null, null, msg + " - selector " + selector + " is not tabbable");
2222
}
2323

2424
test("data", function() {
2525
expect(15);
26-
26+
2727
var el;
2828
function shouldHaveData(msg) {
2929
ok(el.is(':data(test)'), msg);
3030
}
3131
function shouldNotHaveData(msg) {
3232
ok(!el.is(':data(test)'), msg);
3333
}
34-
34+
3535
el = $('<div>');
3636
shouldNotHaveData('data never set');
37-
37+
3838
el = $('<div>').data('test', null);
3939
shouldNotHaveData('data is null');
40-
40+
4141
el = $('<div>').data('test', true);
4242
shouldHaveData('data set to true');
43-
43+
4444
el = $('<div>').data('test', false);
4545
shouldNotHaveData('data set to false');
46-
46+
4747
el = $('<div>').data('test', 0);
4848
shouldNotHaveData('data set to 0');
49-
49+
5050
el = $('<div>').data('test', 1);
5151
shouldHaveData('data set to 1');
52-
52+
5353
el = $('<div>').data('test', '');
5454
shouldNotHaveData('data set to empty string');
55-
55+
5656
el = $('<div>').data('test', 'foo');
5757
shouldHaveData('data set to string');
58-
58+
5959
el = $('<div>').data('test', []);
6060
shouldHaveData('data set to empty array');
61-
61+
6262
el = $('<div>').data('test', [1]);
6363
shouldHaveData('data set to array');
64-
64+
6565
el = $('<div>').data('test', {});
6666
shouldHaveData('data set to empty object');
67-
67+
6868
el = $('<div>').data('test', {foo: 'bar'});
6969
shouldHaveData('data set to object');
70-
70+
7171
el = $('<div>').data('test', new Date());
7272
shouldHaveData('data set to date');
73-
73+
7474
el = $('<div>').data('test', /test/);
7575
shouldHaveData('data set to regexp');
76-
76+
7777
el = $('<div>').data('test', function() {});
7878
shouldHaveData('data set to function');
7979
});
8080

8181
test("focusable - visible, enabled elements", function() {
8282
expect(18);
83-
83+
8484
isNotFocusable('#formNoTabindex', 'form');
8585
isFocusable('#formTabindex', 'form with tabindex');
8686
isFocusable('#visibleAncestor-inputTypeNone', 'input, no type');
@@ -103,7 +103,7 @@ test("focusable - visible, enabled elements", function() {
103103

104104
test("focusable - disabled elements", function() {
105105
expect(9);
106-
106+
107107
isNotFocusable('#disabledElement-inputTypeNone', 'input, no type');
108108
isNotFocusable('#disabledElement-inputTypeText', 'input, type text');
109109
isNotFocusable('#disabledElement-inputTypeCheckbox', 'input, type checkbox');
@@ -117,23 +117,23 @@ test("focusable - disabled elements", function() {
117117

118118
test("focusable - hidden styles", function() {
119119
expect(8);
120-
120+
121121
isNotFocusable('#displayNoneAncestor-input', 'input, display: none parent');
122122
isNotFocusable('#displayNoneAncestor-span', 'span with tabindex, display: none parent');
123-
123+
124124
isNotFocusable('#visibilityHiddenAncestor-input', 'input, visibility: hidden parent');
125125
isNotFocusable('#visibilityHiddenAncestor-span', 'span with tabindex, visibility: hidden parent');
126-
126+
127127
isNotFocusable('#displayNone-input', 'input, display: none');
128128
isNotFocusable('#visibilityHidden-input', 'input, visibility: hidden');
129-
129+
130130
isNotFocusable('#displayNone-span', 'span with tabindex, display: none');
131131
isNotFocusable('#visibilityHidden-span', 'span with tabindex, visibility: hidden');
132132
});
133133

134134
test("focusable - natively focusable with various tabindex", function() {
135135
expect(4);
136-
136+
137137
isFocusable('#inputTabindex0', 'input, tabindex 0');
138138
isFocusable('#inputTabindex10', 'input, tabindex 10');
139139
isFocusable('#inputTabindex-1', 'input, tabindex -1');
@@ -142,24 +142,22 @@ test("focusable - natively focusable with various tabindex", function() {
142142

143143
test("focusable - not natively focusable with various tabindex", function() {
144144
expect(4);
145-
145+
146146
isFocusable('#spanTabindex0', 'span, tabindex 0');
147147
isFocusable('#spanTabindex10', 'span, tabindex 10');
148148
isFocusable('#spanTabindex-1', 'span, tabindex -1');
149149
isFocusable('#spanTabindex-50', 'span, tabindex -50');
150150
});
151151

152152
test("focusable - area elements", function() {
153-
isNotFocusable('#areaCoordsNoHref', 'coords but no href');
154153
isFocusable('#areaCoordsHref', 'coords and href');
155-
isFocusable('#areaCoordsNoSizeHref', 'coords of zero px and href');
156154
isFocusable('#areaNoCoordsHref', 'href but no coords');
157155
isNotFocusable('#areaNoImg', 'not associated with an image');
158156
});
159157

160158
test("tabbable - visible, enabled elements", function() {
161159
expect(18);
162-
160+
163161
isNotTabbable('#formNoTabindex', 'form');
164162
isTabbable('#formTabindex', 'form with tabindex');
165163
isTabbable('#visibleAncestor-inputTypeNone', 'input, no type');
@@ -182,7 +180,7 @@ test("tabbable - visible, enabled elements", function() {
182180

183181
test("tabbable - disabled elements", function() {
184182
expect(9);
185-
183+
186184
isNotTabbable('#disabledElement-inputTypeNone', 'input, no type');
187185
isNotTabbable('#disabledElement-inputTypeText', 'input, type text');
188186
isNotTabbable('#disabledElement-inputTypeCheckbox', 'input, type checkbox');
@@ -196,23 +194,23 @@ test("tabbable - disabled elements", function() {
196194

197195
test("tabbable - hidden styles", function() {
198196
expect(8);
199-
197+
200198
isNotTabbable('#displayNoneAncestor-input', 'input, display: none parent');
201199
isNotTabbable('#displayNoneAncestor-span', 'span with tabindex, display: none parent');
202-
200+
203201
isNotTabbable('#visibilityHiddenAncestor-input', 'input, visibility: hidden parent');
204202
isNotTabbable('#visibilityHiddenAncestor-span', 'span with tabindex, visibility: hidden parent');
205-
203+
206204
isNotTabbable('#displayNone-input', 'input, display: none');
207205
isNotTabbable('#visibilityHidden-input', 'input, visibility: hidden');
208-
206+
209207
isNotTabbable('#displayNone-span', 'span with tabindex, display: none');
210208
isNotTabbable('#visibilityHidden-span', 'span with tabindex, visibility: hidden');
211209
});
212210

213211
test("tabbable - natively tabbable with various tabindex", function() {
214212
expect(4);
215-
213+
216214
isTabbable('#inputTabindex0', 'input, tabindex 0');
217215
isTabbable('#inputTabindex10', 'input, tabindex 10');
218216
isNotTabbable('#inputTabindex-1', 'input, tabindex -1');
@@ -221,17 +219,15 @@ test("tabbable - natively tabbable with various tabindex", function() {
221219

222220
test("tabbable - not natively tabbable with various tabindex", function() {
223221
expect(4);
224-
222+
225223
isTabbable('#spanTabindex0', 'span, tabindex 0');
226224
isTabbable('#spanTabindex10', 'span, tabindex 10');
227225
isNotTabbable('#spanTabindex-1', 'span, tabindex -1');
228226
isNotTabbable('#spanTabindex-50', 'span, tabindex -50');
229227
});
230228

231229
test("tabbable - area elements", function() {
232-
isNotTabbable('#areaCoordsNoHref', 'coords but no href');
233230
isTabbable('#areaCoordsHref', 'coords and href');
234-
isTabbable('#areaCoordsNoSizeHref', 'coords of zero px and href');
235231
isTabbable('#areaNoCoordsHref', 'href but no coords');
236232
isNotTabbable('#areaNoImg', 'not associated with an image');
237233
});

0 commit comments

Comments
 (0)