Permalink
Browse files

Autocomplete: Use appropriate methods for getting scroll values for .…

…prop()/.attr() compat. Fixes #7354 - Autocomplete: Scrollable results don't visually update with jQuery 1.6.
  • Loading branch information...
1 parent 38af07e commit 36110e07d471ee0d59d9ac5b5077deda7005d155 @scottgonzalez scottgonzalez committed May 11, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 ui/jquery.ui.autocomplete.js
@@ -490,12 +490,12 @@ $.widget("ui.menu", {
this.deactivate();
if (this.hasScroll()) {
var offset = item.offset().top - this.element.offset().top,
- scroll = this.element.attr("scrollTop"),
+ scroll = this.element.scrollTop(),
elementHeight = this.element.height();
if (offset < 0) {
- this.element.attr("scrollTop", scroll + offset);
+ this.element.scrollTop( scroll + offset);
} else if (offset >= elementHeight) {
- this.element.attr("scrollTop", scroll + offset - elementHeight + item.height());
+ this.element.scrollTop( scroll + offset - elementHeight + item.height());
}
}
this.active = item.eq(0)
@@ -601,7 +601,7 @@ $.widget("ui.menu", {
},
hasScroll: function() {
- return this.element.height() < this.element.attr("scrollHeight");
+ return this.element.height() < this.element[ $.fn.prop ? "prop" : "attr" ]("scrollHeight");
},
select: function( event ) {

0 comments on commit 36110e0

Please sign in to comment.