Skip to content
Permalink
Browse files

Menu: Refactored next/previousPage logic and activate-scrolling, impr…

…oved much!
  • Loading branch information...
jzaefferer committed Oct 28, 2010
1 parent 184ad69 commit c55977d2ef602131ec39bfc2686d6a6dc2dbcf03
Showing with 29 additions and 31 deletions.
  1. +0 −1 tests/visual/menu/menu.html
  2. +29 −30 ui/jquery.ui.menu.js
@@ -8,7 +8,6 @@
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
<script type="text/javascript">
$(function() {
$.fn.themeswitcher && $('<div/>').css({
@@ -122,13 +122,16 @@ $.widget("ui.menu", {
activate: function( event, item ) {
this.deactivate();
if ( this._hasScroll() ) {
var offset = item.offset().top - this.element.offset().top,
var borderTop = parseFloat( $.curCSS( this.element[0], "borderTopWidth", true) ) || 0,
paddingtop = parseFloat( $.curCSS( this.element[0], "paddingTop", true) ) || 0,
offset = item.offset().top - this.element.offset().top - borderTop - paddingtop,
scroll = this.element.attr( "scrollTop" ),
elementHeight = this.element.height();
if (offset < 0) {
elementHeight = this.element.height(),
itemHeight = item.height();
if ( offset < 0 ) {
this.element.attr( "scrollTop", scroll + offset );
} else if (offset > elementHeight) {
this.element.attr( "scrollTop", scroll + offset - elementHeight + item.height() );
} else if ( offset + itemHeight > elementHeight ) {
this.element.attr( "scrollTop", scroll + offset - elementHeight + itemHeight );
}
}
this.active = item.first()
@@ -187,19 +190,16 @@ $.widget("ui.menu", {
}
var base = this.active.offset().top,
height = this.element.height(),
// TODO replace children with nextAll
// TODO replace filter with each, break once close > 0 and use that item as the result
result = this.element.children( ".ui-menu-item" ).filter( function() {
var close = $( this ).offset().top - base - height + $( this ).height();
// TODO replace with check close > 0
return close < 10 && close > -10;
});

// TODO try to catch this earlier when scrollTop indicates the last page anyway
if ( !result.length ) {
result = this.element.children( ".ui-menu-item" ).last();
}
this.activate( event, result );
result;
this.active.nextAll( ".ui-menu-item" ).each( function() {
var close = $( this ).offset().top - base - height;
if (close >= 0) {
result = $( this );
return false;
}
});

this.activate( event, result || this.element.children( ".ui-menu-item" ).last() );
} else {
this.activate( event, this.element.children( ".ui-menu-item" )
// TODO use .first()/.last()
@@ -216,18 +216,17 @@ $.widget("ui.menu", {
}

var base = this.active.offset().top,
height = this.element.height();
result = this.element.children( ".ui-menu-item" ).filter( function() {
var close = $(this).offset().top - base + height - $(this).height();
// TODO improve approximation
return close < 10 && close > -10;
});

// TODO try to catch this earlier when scrollTop indicates the last page anyway
if (!result.length) {
result = this.element.children( ".ui-menu-item" ).first();
}
this.activate( event, result );
height = this.element.height(),
result;
this.active.prevAll( ".ui-menu-item" ).each( function() {
var close = $(this).offset().top - base + height;
if (close <= 0) {
result = $( this );
return false;
}
});

this.activate( event, result || this.element.children( ".ui-menu-item" ).first() );
} else {
this.activate( event, this.element.children( ".ui-menu-item" )
// TODO use .first()/.last()

0 comments on commit c55977d

Please sign in to comment.
You can’t perform that action at this time.