@@ -18,10 +18,10 @@ test( "handle click on menu", function() {
18
18
}
19
19
} ) ;
20
20
log ( "click" , true ) ;
21
- click ( $ ( "#menu1" ) , "1" ) ;
21
+ click ( element , "1" ) ;
22
22
log ( "afterclick" ) ;
23
23
click ( element , "2" ) ;
24
- click ( $ ( "#menu1" ) , "3" ) ;
24
+ click ( element , "3" ) ;
25
25
click ( element , "1" ) ;
26
26
equal ( logOutput ( ) , "click,1,afterclick,2,3,1" , "Click order not valid." ) ;
27
27
} ) ;
@@ -35,10 +35,10 @@ test( "handle click on custom item menu", function() {
35
35
menus : "div"
36
36
} ) ;
37
37
log ( "click" , true ) ;
38
- click ( $ ( "#menu5" ) , "1" ) ;
38
+ click ( element , "1" ) ;
39
39
log ( "afterclick" ) ;
40
40
click ( element , "2" ) ;
41
- click ( $ ( "#menu5" ) , "3" ) ;
41
+ click ( element , "3" ) ;
42
42
click ( element , "1" ) ;
43
43
equal ( logOutput ( ) , "click,1,afterclick,2,3,1" , "Click order not valid." ) ;
44
44
} ) ;
@@ -96,13 +96,13 @@ asyncTest( "handle focus of menu with active item", function() {
96
96
} ) ;
97
97
98
98
log ( "focus" , true ) ;
99
- element [ 0 ] . focus ( ) ;
99
+ element [ 0 ] . focus ( ) ;
100
100
setTimeout ( function ( ) {
101
101
element . simulate ( "keydown" , { keyCode : $ . ui . keyCode . DOWN } ) ;
102
102
element . simulate ( "keydown" , { keyCode : $ . ui . keyCode . DOWN } ) ;
103
- element [ 0 ] . blur ( ) ;
103
+ element [ 0 ] . blur ( ) ;
104
104
setTimeout ( function ( ) {
105
- element [ 0 ] . focus ( ) ;
105
+ element [ 0 ] . focus ( ) ;
106
106
setTimeout ( function ( ) {
107
107
equal ( logOutput ( ) , "focus,0,1,2,2" , "current active item remains active" ) ;
108
108
start ( ) ;
@@ -174,15 +174,15 @@ asyncTest( "handle keyboard navigation on menu without scroll and without submen
174
174
expect ( 12 ) ;
175
175
var element = $ ( "#menu1" ) . menu ( {
176
176
select : function ( event , ui ) {
177
- log ( $ ( ui . item [ 0 ] ) . text ( ) ) ;
177
+ log ( $ ( ui . item [ 0 ] ) . text ( ) ) ;
178
178
} ,
179
179
focus : function ( event ) {
180
180
log ( $ ( event . target ) . find ( ".ui-state-focus" ) . parent ( ) . index ( ) ) ;
181
181
}
182
182
} ) ;
183
183
184
184
log ( "keydown" , true ) ;
185
- element [ 0 ] . focus ( ) ;
185
+ element [ 0 ] . focus ( ) ;
186
186
setTimeout ( function ( ) {
187
187
element . simulate ( "keydown" , { keyCode : $ . ui . keyCode . DOWN } ) ;
188
188
element . simulate ( "keydown" , { keyCode : $ . ui . keyCode . DOWN } ) ;
@@ -360,15 +360,15 @@ asyncTest( "handle keyboard navigation on menu with scroll and without submenus"
360
360
expect ( 14 ) ;
361
361
var element = $ ( "#menu3" ) . menu ( {
362
362
select : function ( event , ui ) {
363
- log ( $ ( ui . item [ 0 ] ) . text ( ) ) ;
363
+ log ( $ ( ui . item [ 0 ] ) . text ( ) ) ;
364
364
} ,
365
365
focus : function ( event ) {
366
366
log ( $ ( event . target ) . find ( ".ui-state-focus" ) . parent ( ) . index ( ) ) ;
367
367
}
368
368
} ) ;
369
369
370
370
log ( "keydown" , true ) ;
371
- element [ 0 ] . focus ( ) ;
371
+ element [ 0 ] . focus ( ) ;
372
372
setTimeout ( function ( ) {
373
373
element . simulate ( "keydown" , { keyCode : $ . ui . keyCode . DOWN } ) ;
374
374
element . simulate ( "keydown" , { keyCode : $ . ui . keyCode . DOWN } ) ;
@@ -435,7 +435,7 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
435
435
expect ( 14 ) ;
436
436
var element = $ ( "#menu4" ) . menu ( {
437
437
select : function ( event , ui ) {
438
- log ( $ ( ui . item [ 0 ] ) . text ( ) ) ;
438
+ log ( $ ( ui . item [ 0 ] ) . text ( ) ) ;
439
439
} ,
440
440
focus : function ( event ) {
441
441
log ( $ ( event . target ) . find ( ".ui-state-focus" ) . parent ( ) . index ( ) ) ;
@@ -595,26 +595,26 @@ asyncTest( "handle keyboard navigation with spelling of menu items", function()
595
595
equal ( logOutput ( ) , "keydown,0,1,3,4" , "Keydown focus Delphi by repeating the 'd' again" ) ;
596
596
start ( ) ;
597
597
} ) ;
598
- element [ 0 ] . focus ( ) ;
598
+ element [ 0 ] . focus ( ) ;
599
599
} ) ;
600
600
601
601
test ( "ensure default is prevented when clicking on anchors in disabled menus " , function ( ) {
602
602
expect ( 1 ) ;
603
603
var element = $ ( "#menu1" ) . menu ( ) ;
604
- element . bind ( "click.menu" , function ( event ) {
604
+ element . bind ( "click.menu" , function ( event ) {
605
605
if ( ! event . isDefaultPrevented ( ) ) {
606
606
log ( ) ;
607
607
}
608
608
} ) ;
609
609
log ( "click" , true ) ;
610
- click ( $ ( "#menu1" ) , "1" ) ;
610
+ click ( element , "1" ) ;
611
611
log ( "afterclick,disable" ) ;
612
- element . menu ( "option" , "disabled" , true ) ;
612
+ element . menu ( "option" , "disabled" , true ) ;
613
613
click ( element , "2" ) ;
614
- click ( $ ( "#menu1" ) , "3" ) ;
614
+ click ( element , "3" ) ;
615
615
click ( element , "1" ) ;
616
616
log ( "enable" ) ;
617
- element . menu ( "option" , "disabled" , false ) ;
617
+ element . menu ( "option" , "disabled" , false ) ;
618
618
click ( element , "3" ) ;
619
619
equal ( logOutput ( ) , "click,1,afterclick,disable,enable,3" , "Click order not valid." ) ;
620
620
} ) ;
0 commit comments