From: John Resig Date: Tue, 18 Jan 2011 19:20:05 +0000 (-0500) Subject: Merge branch 'master' of https://github.com/russtacular/jquery into russtacular-master X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=c1d719b580ea78c33961113030d7fa25bcc98e6f;hp=-c;p=jquery.git Merge branch 'master' of https://github.com/russtacular/jquery into russtacular-master --- c1d719b580ea78c33961113030d7fa25bcc98e6f diff --combined src/offset.js index 2040c9d,dab053e..a10d30a --- a/src/offset.js +++ b/src/offset.js @@@ -7,7 -7,7 +7,7 @@@ if ( "getBoundingClientRect" in documen jQuery.fn.offset = function( options ) { var elem = this[0], box; - if ( options ) { + if ( options ) { return this.each(function( i ) { jQuery.offset.setOffset( this, options, i ); }); @@@ -30,7 -30,7 +30,7 @@@ // Make sure we're not dealing with a disconnected DOM node if ( !box || !jQuery.contains( docElem, elem ) ) { - return box || { top: 0, left: 0 }; + return box ? { top: box.top, left: box.left } : { top: 0, left: 0 }; } var body = doc.body, @@@ -49,7 -49,7 +49,7 @@@ jQuery.fn.offset = function( options ) { var elem = this[0]; - if ( options ) { + if ( options ) { return this.each(function( i ) { jQuery.offset.setOffset( this, options, i ); }); @@@ -168,7 -168,7 +168,7 @@@ jQuery.offset = return { top: top, left: left }; }, - + setOffset: function( elem, options, i ) { var position = jQuery.css( elem, "position" ); @@@ -202,7 -202,7 +202,7 @@@ if (options.left != null) { props.left = (options.left - curOffset.left) + curLeft; } - + if ( "using" in options ) { options.using.call( elem, props ); } else { @@@ -262,7 -262,7 +262,7 @@@ jQuery.each( ["Left", "Top"], function jQuery.fn[ method ] = function(val) { var elem = this[0], win; - + if ( !elem ) { return null; }