deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix for #4906

Browse source
This commit is contained in:
Brandon Aaron 2009-07-17 21:08:13 +00:00
parent 1a7f72e7fe
commit 4edbff9fc1
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/offset.js
View file

@ -136,17 +136,10 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
jQuery.fn[ method ] = function(val) { jQuery.fn[ method ] = function(val) {
if ( !this[0] ) return null; if ( !this[0] ) return null;
var elem = this[0], win = ("scrollTo" in elem && elem.document) ? elem : if ( val !== undefined ) {
(elem.nodeName === "#document") ? elem.defaultView || elem.parentWindow :
false;
return val !== undefined ?
// Set the scroll offset // Set the scroll offset
this.each(function() { return this.each(function() {
win = ("scrollTo" in this && this.document) ? this : win = getWindow( this );
(this.nodeName === "#document") ? this.defaultView || this.parentWindow :
false;
win ? win ?
win.scrollTo( win.scrollTo(
@ -154,13 +147,23 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
i ? val : jQuery(win).scrollTop() i ? val : jQuery(win).scrollTop()
) : ) :
this[ method ] = val; this[ method ] = val;
}) : });
} else {
var elem = this[0],
win = getWindow( elem );
// Return the scroll offset // Return the scroll offset
win ? return win && 'pageXOffset' in win ?
win[ i ? 'pageYOffset' : 'pageXOffset' ] || win[ i ? 'pageYOffset' : 'pageXOffset' ] ||
jQuery.support.boxModel && win.document.documentElement[ method ] || jQuery.support.boxModel && win.document.documentElement[ method ] ||
win.document.body[ method ] : win.document.body[ method ] :
elem[ method ]; elem[ method ];
}
}; };
function getWindow( elem ) {
return ("scrollTo" in elem && elem.document) ? elem :
(elem.nodeName === "#document") ? elem.defaultView || elem.parentWindow :
false;
}
}); });