Menu: Further refactoring of next/previousPage

jquery · Oct 28, 2010 · 8959057 · 8959057
1 parent c55977d
commit 8959057
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
@@ -192,18 +192,14 @@ $.widget("ui.menu", {
 				height = this.element.height(),
 				result;
 			this.active.nextAll( ".ui-menu-item" ).each( function() {
-				var close = $( this ).offset().top - base - height;
+				result = $( this );
-				if (close >= 0) {
+				return $( this ).offset().top - base - height < 0;
-					result = $( this );
-					return false;
-				}
 			});
 
-			this.activate( event, result || this.element.children( ".ui-menu-item" ).last() );
+			this.activate( event, result );
 		} else {
 			this.activate( event, this.element.children( ".ui-menu-item" )
-				// TODO use .first()/.last()
+				[ !this.active || this.last() ? "first" : "last" ]() );
-				.filter( !this.active || this.last() ? ":first" : ":last" ) );
 		}
 	},
 
@@ -219,18 +215,14 @@ $.widget("ui.menu", {
 				height = this.element.height(),
 				result;
 			this.active.prevAll( ".ui-menu-item" ).each( function() {
-				var close = $(this).offset().top - base + height;
+				result = $( this );
-				if (close <= 0) {
+				return $(this).offset().top - base + height > 0;
-					result = $( this );
-					return false;
-				}
 			});
 
-			this.activate( event, result || this.element.children( ".ui-menu-item" ).first() );
+			this.activate( event, result );
 		} else {
 			this.activate( event, this.element.children( ".ui-menu-item" )
-				// TODO use .first()/.last()
+				[ !this.active || this.first() ? ":last" : ":first" ]() );
-				.filter( !this.active || this.first() ? ":last" : ":first" ) );
 		}
 	},