Skip to content

Commit 2c60638

Browse files
scottgonzalezscottgonzalez
committed
Merge branch 'master' into tabs-aria
Conflicts: ui/jquery.ui.tabs.js
2 parents 0c05afc + 0bbad34 commit 2c60638

25 files changed

+456
-222
lines changed

‎demos/datepicker/localization.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<script src="../../ui/i18n/jquery.ui.datepicker-fo.js"></script>
3333
<script src="../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
3434
<script src="../../ui/i18n/jquery.ui.datepicker-fr-CH.js"></script>
35-
<script src="../../ui/i18n/jquery.ui.datepicker-ge.js"></script>
3635
<script src="../../ui/i18n/jquery.ui.datepicker-gl.js"></script>
3736
<script src="../../ui/i18n/jquery.ui.datepicker-he.js"></script>
3837
<script src="../../ui/i18n/jquery.ui.datepicker-hi.js"></script>
@@ -43,6 +42,7 @@
4342
<script src="../../ui/i18n/jquery.ui.datepicker-is.js"></script>
4443
<script src="../../ui/i18n/jquery.ui.datepicker-it.js"></script>
4544
<script src="../../ui/i18n/jquery.ui.datepicker-ja.js"></script>
45+
<script src="../../ui/i18n/jquery.ui.datepicker-ka.js"></script>
4646
<script src="../../ui/i18n/jquery.ui.datepicker-kk.js"></script>
4747
<script src="../../ui/i18n/jquery.ui.datepicker-km.js"></script>
4848
<script src="../../ui/i18n/jquery.ui.datepicker-ko.js"></script>

‎demos/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<script src="../ui/i18n/jquery.ui.datepicker-fo.js"></script>
6767
<script src="../ui/i18n/jquery.ui.datepicker-fr.js"></script>
6868
<script src="../ui/i18n/jquery.ui.datepicker-fr-CH.js"></script>
69-
<script src="../ui/i18n/jquery.ui.datepicker-ge.js"></script>
7069
<script src="../ui/i18n/jquery.ui.datepicker-gl.js"></script>
7170
<script src="../ui/i18n/jquery.ui.datepicker-he.js"></script>
7271
<script src="../ui/i18n/jquery.ui.datepicker-hi.js"></script>
@@ -77,6 +76,7 @@
7776
<script src="../ui/i18n/jquery.ui.datepicker-is.js"></script>
7877
<script src="../ui/i18n/jquery.ui.datepicker-it.js"></script>
7978
<script src="../ui/i18n/jquery.ui.datepicker-ja.js"></script>
79+
<script src="../ui/i18n/jquery.ui.datepicker-ka.js"></script>
8080
<script src="../ui/i18n/jquery.ui.datepicker-kk.js"></script>
8181
<script src="../ui/i18n/jquery.ui.datepicker-km.js"></script>
8282
<script src="../ui/i18n/jquery.ui.datepicker-ko.js"></script>

‎tests/unit/accordion/accordion_deprecated.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(function( $ ) {
22

3-
var equalHeights = TestHelpers.accordion.equalHeights,
3+
var equalHeight = TestHelpers.accordion.equalHeight,
44
setupTeardown = TestHelpers.accordion.setupTeardown,
55
state = TestHelpers.accordion.state;
66

@@ -109,7 +109,7 @@ module( "accordion (deprecated) - height options", setupTeardown() );
109109

110110
test( "{ autoHeight: true }, default", function() {
111111
expect( 3 );
112-
equalHeights( $( "#navigation" ).accordion({ autoHeight: true }), 95, 130 );
112+
equalHeight( $( "#navigation" ).accordion({ autoHeight: true }), 105 );
113113
});
114114

115115
test( "{ autoHeight: false }", function() {
@@ -128,7 +128,7 @@ test( "{ fillSpace: true }", function() {
128128
expect( 3 );
129129
$( "#navigationWrapper" ).height( 500 );
130130
var element = $( "#navigation" ).accordion({ fillSpace: true });
131-
equalHeights( element, 446, 458 );
131+
equalHeight( element, 455 );
132132
});
133133

134134
test( "{ fillSapce: true } with sibling", function() {
@@ -142,7 +142,7 @@ test( "{ fillSapce: true } with sibling", function() {
142142
})
143143
.prependTo( "#navigationWrapper" );
144144
var element = $( "#navigation" ).accordion({ fillSpace: true });
145-
equalHeights( element , 346, 358);
145+
equalHeight( element , 355 );
146146
});
147147

148148
test( "{ fillSpace: true } with multiple siblings", function() {
@@ -171,7 +171,7 @@ test( "{ fillSpace: true } with multiple siblings", function() {
171171
})
172172
.prependTo( "#navigationWrapper" );
173173
var element = $( "#navigation" ).accordion({ fillSpace: true });
174-
equalHeights( element, 296, 308 );
174+
equalHeight( element, 305 );
175175
});
176176

177177

@@ -206,11 +206,11 @@ test( "resize", function() {
206206
.accordion({
207207
heightStyle: "fill"
208208
});
209-
equalHeights( element, 246, 258 );
209+
equalHeight( element, 255 );
210210

211211
element.parent().height( 500 );
212212
element.accordion( "resize" );
213-
equalHeights( element, 446, 458 );
213+
equalHeight( element, 455 );
214214
});
215215

216216

‎tests/unit/accordion/accordion_methods.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(function( $ ) {
22

3-
var equalHeights = TestHelpers.accordion.equalHeights,
3+
var equalHeight = TestHelpers.accordion.equalHeight,
44
setupTeardown = TestHelpers.accordion.setupTeardown,
55
state = TestHelpers.accordion.state;
66

@@ -38,11 +38,11 @@ test( "refresh", function() {
3838
.accordion({
3939
heightStyle: "fill"
4040
});
41-
equalHeights( element, 246, 258 );
41+
equalHeight( element, 255 );
4242

4343
element.parent().height( 500 );
4444
element.accordion( "refresh" );
45-
equalHeights( element, 446, 458 );
45+
equalHeight( element, 455 );
4646
});
4747

4848
}( jQuery ) );

‎tests/unit/accordion/accordion_options.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(function( $ ) {
22

3-
var equalHeights = TestHelpers.accordion.equalHeights,
3+
var equalHeight = TestHelpers.accordion.equalHeight,
44
setupTeardown = TestHelpers.accordion.setupTeardown,
55
state = TestHelpers.accordion.state;
66

@@ -359,7 +359,7 @@ test( "{ header: custom }", function() {
359359
test( "{ heightStyle: 'auto' }", function() {
360360
expect( 3 );
361361
var element = $( "#navigation" ).accordion({ heightStyle: "auto" });
362-
equalHeights( element, 95, 130 );
362+
equalHeight( element, 105 );
363363
});
364364

365365
test( "{ heightStyle: 'content' }", function() {
@@ -368,16 +368,16 @@ test( "{ heightStyle: 'content' }", function() {
368368
sizes = element.find( ".ui-accordion-content" ).map(function() {
369369
return $( this ).height();
370370
}).get();
371-
ok( sizes[ 0 ] >= 70 && sizes[ 0 ] <= 105, "was " + sizes[ 0 ] );
372-
ok( sizes[ 1 ] >= 98 && sizes[ 1 ] <= 126, "was " + sizes[ 1 ] );
373-
ok( sizes[ 2 ] >= 42 && sizes[ 2 ] <= 54, "was " + sizes[ 2 ] );
371+
equal( sizes[ 0 ], 75 );
372+
equal( sizes[ 1 ], 105 );
373+
equal( sizes[ 2 ], 45 );
374374
});
375375

376376
test( "{ heightStyle: 'fill' }", function() {
377377
expect( 3 );
378378
$( "#navigationWrapper" ).height( 500 );
379379
var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
380-
equalHeights( element, 446, 458 );
380+
equalHeight( element, 455 );
381381
});
382382

383383
test( "{ heightStyle: 'fill' } with sibling", function() {
@@ -391,7 +391,7 @@ test( "{ heightStyle: 'fill' } with sibling", function() {
391391
})
392392
.prependTo( "#navigationWrapper" );
393393
var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
394-
equalHeights( element , 346, 358);
394+
equalHeight( element , 355 );
395395
});
396396

397397
test( "{ heightStyle: 'fill' } with multiple siblings", function() {
@@ -420,7 +420,7 @@ test( "{ heightStyle: 'fill' } with multiple siblings", function() {
420420
})
421421
.prependTo( "#navigationWrapper" );
422422
var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
423-
equalHeights( element, 296, 308 );
423+
equalHeight( element, 305 );
424424
});
425425

426426
test( "{ icons: false }", function() {

‎tests/unit/accordion/accordion_test_helpers.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
TestHelpers.accordion = {
2-
equalHeights: function( accordion, min, max ) {
3-
var sizes = [];
2+
equalHeight: function( accordion, height ) {
43
accordion.find( ".ui-accordion-content" ).each(function() {
5-
sizes.push( $( this ).outerHeight() );
4+
equal( $( this ).outerHeight(), height );
65
});
7-
ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
8-
"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
9-
deepEqual( sizes[ 0 ], sizes[ 1 ] );
10-
deepEqual( sizes[ 0 ], sizes[ 2 ] );
116
},
127

138
setupTeardown: function() {

‎tests/unit/menu/menu.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,11 @@ <h2 id="qunit-userAgent"></h2>
8888
<a href="#">Delphi</a>
8989
<ul>
9090
<li class="foo"><a class="foo" href="#">Ada</a></li>
91+
<li> - </li>
9192
<li class="foo"><a class="foo" href="#">Saarland</a></li>
93+
<li></li>
9294
<li class="foo"><a class="foo" href="#">Salzburg</a></li>
95+
<li>&ndash;</li>
9396
</ul>
9497
</li>
9598
<li class="foo"><a class="foo" href="#">Perch</a></li>

‎tests/unit/menu/menu_events.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -315,16 +315,27 @@ asyncTest("handle keyboard navigation on menu without scroll and with submenus",
315315
equal( $("#log").html(), "4,keydown,", "Keydown ESCAPE (close submenu)");
316316

317317
log("keydown",true);
318-
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
319-
setTimeout( menukeyboard5, 50 );
318+
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
319+
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
320+
element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
321+
setTimeout( function() {
322+
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
323+
element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
324+
setTimeout( function() {
325+
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
326+
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
327+
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
328+
equal( $("#log").html(), "0,4,2,0,1,0,6,5,keydown,", "Keydown skip dividers and items without anchors");
329+
330+
log("keydown",true);
331+
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
332+
setTimeout( menukeyboard6, 50 );
333+
}, 50 );
334+
}, 50 );
320335
}
321336

322-
function menukeyboard5() {
323-
equal( $("#log").html(), "0,keydown,", "Keydown ENTER (open submenu)");
324-
325-
log("keydown",true);
326-
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
327-
equal( $("#log").html(), "Ada,keydown,", "Keydown ENTER (select item)");
337+
function menukeyboard6() {
338+
equal( $("#log").html(), "Ada,keydown,", "Keydown ENTER (open submenu)");
328339

329340
start();
330341
}

‎tests/unit/menu/menu_methods.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,17 @@ test( "enable/disable", function() {
2929
});
3030

3131
test( "refresh", function() {
32-
expect( 3 );
32+
expect( 5 );
3333
var menu = $( "#menu1" ).menu();
3434
equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
3535
menu.append("<li><a href='#'>test item</a></li>").menu("refresh");
3636
equal(menu.find(".ui-menu-item").length,6,"Incorrect number of menu items");
3737
menu.find(".ui-menu-item:last").remove().end().menu("refresh");
3838
equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
39+
menu.append("<li>---</li>").menu("refresh");
40+
equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
41+
menu.children(":last").remove().end().menu("refresh");
42+
equal(menu.find(".ui-menu-item").length,5,"Incorrect number of menu items");
3943
});
4044

4145
test("destroy", function() {

‎tests/unit/progressbar/progressbar_core.js

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
1-
/*
2-
* progressbar_core.js
3-
*/
1+
module( "progressbar: core" );
42

5-
var el;
3+
test( "accessibility", function() {
4+
expect( 7 );
5+
var element = $( "#progressbar" ).progressbar();
66

7-
(function($) {
7+
equal( element.attr( "role" ), "progressbar", "aria role" );
8+
equal( element.attr( "aria-valuemin" ), 0, "aria-valuemin" );
9+
equal( element.attr( "aria-valuemax" ), 100, "aria-valuemax" );
10+
equal( element.attr( "aria-valuenow" ), 0, "aria-valuenow initially" );
811

9-
module("progressbar: core");
12+
element.progressbar( "value", 77 );
13+
equal( element.attr( "aria-valuenow" ), 77, "aria-valuenow" );
1014

11-
test("accessibility", function() {
12-
expect(7);
13-
el = $("#progressbar").progressbar();
15+
element.progressbar( "disable" );
16+
equal( element.attr( "aria-disabled" ), "true", "aria-disabled on" );
1417

15-
equal(el.attr("role"), "progressbar", "aria role");
16-
equal(el.attr("aria-valuemin"), 0, "aria-valuemin");
17-
equal(el.attr("aria-valuemax"), 100, "aria-valuemax");
18-
equal(el.attr("aria-valuenow"), 0, "aria-valuenow initially");
19-
el.progressbar("value", 77);
20-
equal(el.attr("aria-valuenow"), 77, "aria-valuenow");
21-
el.progressbar("disable");
22-
equal(el.attr("aria-disabled"), "true", "aria-disabled on");
23-
el.progressbar("enable");
24-
// FAIL: for some reason IE6 and 7 return a boolean false instead of the string
25-
equal(el.attr("aria-disabled"), "false", "aria-disabled off");
18+
element.progressbar( "enable" );
19+
equal( element.attr( "aria-disabled" ), "false", "aria-disabled off" );
2620
});
27-
28-
})(jQuery);

‎tests/unit/progressbar/progressbar_events.js

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,43 @@
1-
/*
2-
* progressbar_events.js
3-
*/
4-
(function($) {
1+
module( "progressbar: events" );
52

6-
module("progressbar: events");
7-
8-
test("create", function() {
9-
expect(1);
10-
$("#progressbar").progressbar({
3+
test( "create", function() {
4+
expect( 1 );
5+
$( "#progressbar" ).progressbar({
116
value: 5,
127
create: function() {
13-
deepEqual(5, $(this).progressbar("value") );
8+
deepEqual( 5, $( this ).progressbar( "value" ) );
149
},
1510
change: function() {
16-
ok(false, 'create() has triggered change()');
11+
ok( false, "create() has triggered change()" );
1712
}
1813
});
1914
});
2015

21-
test("change", function() {
22-
expect(1);
23-
$("#progressbar").progressbar({
16+
test( "change", function() {
17+
expect( 1 );
18+
$( "#progressbar" ).progressbar({
2419
change: function() {
25-
deepEqual( 5, $(this).progressbar("value") );
20+
deepEqual( 5, $( this ).progressbar( "value" ) );
2621
}
27-
}).progressbar("value", 5);
22+
}).progressbar( "value", 5 );
2823
});
2924

3025
test( "complete", function() {
3126
expect( 3 );
32-
var changes = 0,
33-
value;
34-
35-
$( "#progressbar" ).progressbar({
36-
change: function() {
37-
changes++;
38-
deepEqual( $( this ).progressbar( "value" ), value, "change at " + value );
39-
},
40-
complete: function() {
41-
equal( changes, 2, "complete triggered after change" );
42-
}
43-
});
27+
var value,
28+
changes = 0,
29+
element = $( "#progressbar" ).progressbar({
30+
change: function() {
31+
changes++;
32+
deepEqual( element.progressbar( "value" ), value, "change at " + value );
33+
},
34+
complete: function() {
35+
equal( changes, 2, "complete triggered after change" );
36+
}
37+
});
4438

4539
value = 5;
46-
$( "#progressbar" ).progressbar( "value", value );
40+
element.progressbar( "value", value );
4741
value = 100;
48-
$( "#progressbar" ).progressbar( "value", value );
42+
element.progressbar( "value", value );
4943
});
50-
51-
})(jQuery);

0 commit comments

Comments
 (0)