@@ -192,18 +192,14 @@ $.widget("ui.menu", {
192
192
height = this . element . height ( ) ,
193
193
result ;
194
194
this . active . nextAll ( ".ui-menu-item" ) . each ( function ( ) {
195
- var close = $ ( this ) . offset ( ) . top - base - height ;
196
- if ( close >= 0 ) {
197
- result = $ ( this ) ;
198
- return false ;
199
- }
195
+ result = $ ( this ) ;
196
+ return $ ( this ) . offset ( ) . top - base - height < 0 ;
200
197
} ) ;
201
198
202
- this . activate ( event , result || this . element . children ( ".ui-menu-item" ) . last ( ) ) ;
199
+ this . activate ( event , result ) ;
203
200
} else {
204
201
this . activate ( event , this . element . children ( ".ui-menu-item" )
205
- // TODO use .first()/.last()
206
- . filter ( ! this . active || this . last ( ) ? ":first" : ":last" ) ) ;
202
+ [ ! this . active || this . last ( ) ? "first" : "last" ] ( ) ) ;
207
203
}
208
204
} ,
209
205
@@ -219,18 +215,14 @@ $.widget("ui.menu", {
219
215
height = this . element . height ( ) ,
220
216
result ;
221
217
this . active . prevAll ( ".ui-menu-item" ) . each ( function ( ) {
222
- var close = $ ( this ) . offset ( ) . top - base + height ;
223
- if ( close <= 0 ) {
224
- result = $ ( this ) ;
225
- return false ;
226
- }
218
+ result = $ ( this ) ;
219
+ return $ ( this ) . offset ( ) . top - base + height > 0 ;
227
220
} ) ;
228
221
229
- this . activate ( event , result || this . element . children ( ".ui-menu-item" ) . first ( ) ) ;
222
+ this . activate ( event , result ) ;
230
223
} else {
231
224
this . activate ( event , this . element . children ( ".ui-menu-item" )
232
- // TODO use .first()/.last()
233
- . filter ( ! this . active || this . first ( ) ? ":last" : ":first" ) ) ;
225
+ [ ! this . active || this . first ( ) ? ":last" : ":first" ] ( ) ) ;
234
226
}
235
227
} ,
236
228
0 commit comments