@@ -315,24 +315,28 @@ $( document ).on( "mobileinit", function() {
315
315
input = this . element . prev ( "form" ) . find ( "input" ) ;
316
316
317
317
if ( e . which === $ . ui . keyCode . DOWN ) {
318
- if ( this . element . find ( "li.ui-button-active" ) . length === 0 ) {
319
- this . element . find ( "li:first" ) . toggleClass ( "ui-button-active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
318
+ if ( this . element . find ( "li.ui-listview-item-active" ) . length === 0 ) {
319
+ this . element . find ( "li:not('.ui-screen-hidden'):first" ) . toggleClass ( "ui-listview-item-active" )
320
+ . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
320
321
} else {
321
- this . element . find ( "li.ui-button-active a" ) . toggleClass ( "ui-button-active" ) ;
322
- this . element . find ( "li.ui-button-active" ) . toggleClass ( "ui-button-active" ) . next ( ) . toggleClass ( "ui-button-active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
322
+ this . element . find ( "li.ui-listview-item-active a" ) . toggleClass ( "ui-button-active" ) ;
323
+ this . element . find ( "li.ui-listview-item-active" ) . toggleClass ( "ui-listview-item-active" )
324
+ . nextAll ( "li:not('.ui-screen-hidden'):first" ) . toggleClass ( "ui-listview-item-active" )
325
+ . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
323
326
}
324
-
325
- this . highlightDown ( ) ;
326
327
} else if ( e . which === $ . ui . keyCode . UP ) {
327
- if ( this . element . find ( "li.ui-button-active" ) . length !== 0 ) {
328
- this . element . find ( "li.ui-button-active a" ) . toggleClass ( "ui-button-active" ) ;
329
- this . element . find ( "li.ui-button-active" ) . toggleClass ( "ui-button-active" ) . prev ( ) . toggleClass ( "ui-button-active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
328
+ if ( this . element . find ( "li.ui-listview-item-active" ) . length !== 0 ) {
329
+ this . element . find ( "li.ui-listview-item-active a" ) . toggleClass ( "ui-button-active" ) ;
330
+ this . element . find ( "li.ui-listview-item-active" ) . toggleClass ( "ui-listview-item-active" )
331
+ . prevAll ( "li:not('.ui-screen-hidden'):first" ) . toggleClass ( "ui-listview-item-active" )
332
+ . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
330
333
} else {
331
- this . element . find ( "li:last" ) . toggleClass ( "ui-button -active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
334
+ this . element . find ( "li:not('.ui-screen-hidden'): last" ) . toggleClass ( "ui-listview-item -active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
332
335
}
333
- this . highlightUp ( ) ;
334
- } else if ( typeof e . which !== "undefined" ) {
335
- this . element . find ( "li.ui-button-active" ) . removeClass ( "ui-button-active" ) ;
336
+ } else if ( e . which === $ . ui . keyCode . ENTER ) {
337
+ this . submitHandler ( ) ;
338
+ } else if ( typeof e . which !== "undefined" ) {
339
+ this . element . find ( "li.ui-listview-item-active" ) . removeClass ( "ui-listview-item-active" ) ;
336
340
337
341
if ( this . options . highlight ) {
338
342
search = input . val ( ) ;
@@ -345,8 +349,8 @@ $( document ).on( "mobileinit", function() {
345
349
}
346
350
} ,
347
351
submitHandler : function ( ) {
348
- if ( this . element . find ( "li.ui-button -active" ) . length !== 0 ) {
349
- var href = this . element . find ( "li.ui-button -active a" ) . attr ( "href" ) ;
352
+ if ( this . element . find ( "li.ui-listview-item -active" ) . length !== 0 ) {
353
+ var href = this . element . find ( "li.ui-listview-item -active a" ) . attr ( "href" ) ;
350
354
351
355
$ ( ":mobile-pagecontainer" ) . pagecontainer ( "change" , href ) ;
352
356
return false ;
@@ -355,22 +359,6 @@ $( document ).on( "mobileinit", function() {
355
359
if ( this . options . submitTo ) {
356
360
this . submitTo ( ) ;
357
361
}
358
- } ,
359
- highlightDown : function ( ) {
360
- if ( this . element . find ( "li.ui-button-active" ) . hasClass ( "ui-screen-hidden" ) ) {
361
- this . element . find ( "li.ui-button-active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
362
- this . element . find ( "li.ui-button-active" ) . toggleClass ( "ui-button-active" ) . next ( ) . toggleClass ( "ui-button-active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
363
- this . highlightDown ( ) ;
364
- }
365
- return ;
366
- } ,
367
- highlightUp : function ( ) {
368
- if ( this . element . find ( "li.ui-button-active" ) . hasClass ( "ui-screen-hidden" ) ) {
369
- this . element . find ( "li.ui-button-active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
370
- this . element . find ( "li.ui-button-active" ) . toggleClass ( "ui-button-active" ) . prev ( ) . toggleClass ( "ui-button-active" ) . find ( "a" ) . toggleClass ( "ui-button-active" ) ;
371
- this . highlightUp ( ) ;
372
- }
373
- return ;
374
362
}
375
363
} ) ;
376
364
} ) ( jQuery ) ;
0 commit comments