Skip to content

Commit 86eaa30

Browse files
committed
Menu tests: Whitespace and general cleanup
1 parent a74ac17 commit 86eaa30

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

tests/unit/menu/menu_events.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ test( "handle click on menu", function() {
1818
}
1919
});
2020
log( "click", true );
21-
click( $( "#menu1" ), "1" );
21+
click( element, "1" );
2222
log( "afterclick" );
2323
click( element, "2" );
24-
click( $( "#menu1" ), "3" );
24+
click( element, "3" );
2525
click( element, "1" );
2626
equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
2727
});
@@ -35,10 +35,10 @@ test( "handle click on custom item menu", function() {
3535
menus: "div"
3636
});
3737
log( "click", true );
38-
click( $( "#menu5" ), "1" );
38+
click( element, "1" );
3939
log( "afterclick" );
4040
click( element, "2" );
41-
click( $( "#menu5" ), "3" );
41+
click( element, "3" );
4242
click( element, "1" );
4343
equal( logOutput(), "click,1,afterclick,2,3,1", "Click order not valid." );
4444
});
@@ -96,13 +96,13 @@ asyncTest( "handle focus of menu with active item", function() {
9696
});
9797

9898
log( "focus", true );
99-
element[0].focus();
99+
element[ 0 ].focus();
100100
setTimeout(function() {
101101
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
102102
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
103-
element[0].blur();
103+
element[ 0 ].blur();
104104
setTimeout(function() {
105-
element[0].focus();
105+
element[ 0 ].focus();
106106
setTimeout(function() {
107107
equal( logOutput(), "focus,0,1,2,2", "current active item remains active" );
108108
start();
@@ -174,15 +174,15 @@ asyncTest( "handle keyboard navigation on menu without scroll and without submen
174174
expect( 12 );
175175
var element = $( "#menu1" ).menu({
176176
select: function( event, ui ) {
177-
log( $( ui.item[0] ).text() );
177+
log( $( ui.item[ 0 ] ).text() );
178178
},
179179
focus: function( event ) {
180180
log( $( event.target ).find( ".ui-state-focus" ).parent().index() );
181181
}
182182
});
183183

184184
log( "keydown", true );
185-
element[0].focus();
185+
element[ 0 ].focus();
186186
setTimeout(function() {
187187
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
188188
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -360,15 +360,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and without submenus"
360360
expect( 14 );
361361
var element = $( "#menu3" ).menu({
362362
select: function( event, ui ) {
363-
log( $( ui.item[0] ).text() );
363+
log( $( ui.item[ 0 ] ).text() );
364364
},
365365
focus: function( event ) {
366366
log( $( event.target ).find( ".ui-state-focus" ).parent().index());
367367
}
368368
});
369369

370370
log( "keydown", true );
371-
element[0].focus();
371+
element[ 0 ].focus();
372372
setTimeout(function() {
373373
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
374374
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
@@ -435,7 +435,7 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
435435
expect( 14 );
436436
var element = $( "#menu4" ).menu({
437437
select: function( event, ui ) {
438-
log( $( ui.item[0] ).text() );
438+
log( $( ui.item[ 0 ] ).text() );
439439
},
440440
focus: function( event ) {
441441
log( $( event.target ).find( ".ui-state-focus" ).parent().index());
@@ -595,26 +595,26 @@ asyncTest( "handle keyboard navigation with spelling of menu items", function()
595595
equal( logOutput(), "keydown,0,1,3,4", "Keydown focus Delphi by repeating the 'd' again" );
596596
start();
597597
});
598-
element[0].focus();
598+
element[ 0 ].focus();
599599
});
600600

601601
test( "ensure default is prevented when clicking on anchors in disabled menus ", function() {
602602
expect( 1 );
603603
var element = $( "#menu1" ).menu();
604-
element.bind("click.menu", function(event) {
604+
element.bind( "click.menu", function(event) {
605605
if ( !event.isDefaultPrevented() ) {
606606
log();
607607
}
608608
});
609609
log( "click", true );
610-
click( $( "#menu1" ), "1" );
610+
click( element, "1" );
611611
log( "afterclick,disable" );
612-
element.menu("option", "disabled", true);
612+
element.menu( "option", "disabled", true );
613613
click( element, "2" );
614-
click( $( "#menu1" ), "3" );
614+
click( element, "3" );
615615
click( element, "1" );
616616
log( "enable" );
617-
element.menu("option", "disabled", false);
617+
element.menu( "option", "disabled", false );
618618
click( element, "3" );
619619
equal( logOutput(), "click,1,afterclick,disable,enable,3", "Click order not valid." );
620620
});

tests/unit/menu/menu_methods.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ test( "refresh submenu", function() {
6565
var element = $( "#menu2" ).menu();
6666
equal( element.find( "ul:first .ui-menu-item" ).length, 3 );
6767
element.find( "ul" ).addBack().append( "<li><a href=\"#\">New Item</a></li>" );
68-
element.menu("refresh");
68+
element.menu( "refresh" );
6969
equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
7070
});
7171

@@ -79,7 +79,7 @@ test( "refresh icons (see #9377)", function() {
7979
ok( element.hasClass( "ui-menu-icons" ) );
8080
element.find( "li:first a" ).html( "Save" );
8181
element.menu( "refresh" );
82-
ok( !element.hasClass( "ui-menu-icons") );
82+
ok( !element.hasClass( "ui-menu-icons" ) );
8383
});
8484

8585
test( "widget", function() {

tests/unit/menu/menu_options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ test( "{ icons: default }", function() {
4545
var element = $( "#menu2" ).menu();
4646
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-carat-1-e" );
4747

48-
element.menu("option", "icons.submenu", "ui-icon-triangle-1-e");
48+
element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
4949
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-triangle-1-e" );
5050
});
5151

0 commit comments

Comments
 (0)