Skip to content

Commit 8959057

Browse files
committed
Menu: Further refactoring of next/previousPage
1 parent c55977d commit 8959057

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

ui/jquery.ui.menu.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,14 @@ $.widget("ui.menu", {
192192
height = this.element.height(),
193193
result;
194194
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;
200197
});
201198

202-
this.activate( event, result || this.element.children( ".ui-menu-item" ).last() );
199+
this.activate( event, result );
203200
} else {
204201
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" ]() );
207203
}
208204
},
209205

@@ -219,18 +215,14 @@ $.widget("ui.menu", {
219215
height = this.element.height(),
220216
result;
221217
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;
227220
});
228221

229-
this.activate( event, result || this.element.children( ".ui-menu-item" ).first() );
222+
this.activate( event, result );
230223
} else {
231224
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" ]() );
234226
}
235227
},
236228

0 commit comments

Comments
 (0)