diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-11 19:49:16 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-11 19:49:16 +0200 |
| commit | 83424c6c334406d427d9eef8e4fe22fd9da0a37a (patch) | |
| tree | bcc89c0d30aaf9d2333246075a43c03c5fabeb2a /ui/jquery.ui.menu.js | |
| parent | 0352c2c71f32553612301f57741f249476234746 (diff) | |
| parent | b9153258b0f0edbff49496ed16d2aa93bec07d95 (diff) | |
| download | jquery-ui-83424c6c334406d427d9eef8e4fe22fd9da0a37a.tar.gz jquery-ui-83424c6c334406d427d9eef8e4fe22fd9da0a37a.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui
Diffstat (limited to 'ui/jquery.ui.menu.js')
| -rw-r--r-- | ui/jquery.ui.menu.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 5fcb0ac90..41b2e7a1a 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -233,15 +233,15 @@ $.widget("ui.menu", { if ( this._hasScroll() ) { 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" ), + paddingTop = parseFloat( $.curCSS( this.element[0], "paddingTop", true) ) || 0, + offset = item.offset().top - this.element.offset().top - borderTop - paddingTop, + scroll = this.element.scrollTop(), elementHeight = this.element.height(), itemHeight = item.height(); if ( offset < 0 ) { - this.element.attr( "scrollTop", scroll + offset ); + this.element.scrollTop( scroll + offset ); } else if ( offset + itemHeight > elementHeight ) { - this.element.attr( "scrollTop", scroll + offset - elementHeight + itemHeight ); + this.element.scrollTop( scroll + offset - elementHeight + itemHeight ); } } @@ -406,7 +406,8 @@ $.widget("ui.menu", { }, _hasScroll: function() { - return this.element.height() < this.element.attr( "scrollHeight" ); + // TODO: just use .prop() when we drop support for jQuery <1.6 + return this.element.height() < this.element[ $.fn.prop ? "prop" : "attr" ]( "scrollHeight" ); }, select: function( event ) { |