X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=7343353b5d8b01e3757a68d28bf7fa9055882197;hb=97e134fe80a734b97170bf43c9459511f4e165c7;hp=964844e7ddb406b93273d8a639eba1efd13c765e;hpb=432ea4ca6cbd63cd972718d3a44772fe8ef1022b;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 964844e..7343353 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -1,54 +1,83 @@
-if ( "getBoundingClientRect" in document.documentElement )
-	jQuery.fn.offset = function() {
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
 		var elem = this[0];
-		if ( !elem || !elem.ownerDocument ) return null;
-		if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
+		if ( !elem || !elem.ownerDocument ) { return null; }
+		if ( options ) { 
+			return this.each(function() {
+				jQuery.offset.setOffset( this, options );
+			});
+		}
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
 		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
 			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
 			top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
 			left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
 		return { top: top, left: left };
 	};
-else
-	jQuery.fn.offset = function() {
+} else {
+	jQuery.fn.offset = function( options ) {
 		var elem = this[0];
-		if ( !elem || !elem.ownerDocument ) return null;
-		if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
+		if ( !elem || !elem.ownerDocument ) { return null; }
+		if ( options ) { 
+			return this.each(function() {
+				jQuery.offset.setOffset( this, options );
+			});
+		}
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
 		jQuery.offset.initialize();
 
 		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
 			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
 			body = doc.body, defaultView = doc.defaultView,
-			prevComputedStyle = defaultView.getComputedStyle(elem, null),
+			prevComputedStyle = defaultView.getComputedStyle( elem, null ),
 			top = elem.offsetTop, left = elem.offsetLeft;
 
 		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) break;
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) { break; }
+
 			computedStyle = defaultView.getComputedStyle(elem, null);
-			top -= elem.scrollTop, left -= elem.scrollLeft;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
 			if ( elem === offsetParent ) {
-				top += elem.offsetTop, left += elem.offsetLeft;
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) )
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0,
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
 					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
 				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
 			}
-			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" )
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0,
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
 				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
 			prevComputedStyle = computedStyle;
 		}
 
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" )
-			top  += body.offsetTop,
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
 			left += body.offsetLeft;
+		}
 
-		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" )
-			top  += Math.max( docElem.scrollTop, body.scrollTop ),
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
 			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
 
 		return { top: top, left: left };
 	};
+}
 
 jQuery.offset = {
 	initialize: function() {
@@ -59,14 +88,17 @@ jQuery.offset = {
 
 		container.innerHTML = html;
 		body.insertBefore( container, body.firstChild );
-		innerDiv = container.firstChild, checkDiv = innerDiv.firstChild, td = innerDiv.nextSibling.firstChild.firstChild;
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
 
 		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
 		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
 
 		checkDiv.style.position = 'fixed', checkDiv.style.top = '20px';
-		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15); // safari subtracts parent border width here which is 5px
-		checkDiv.style.position = '', checkDiv.style.top = '';
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = '';
 
 		innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative';
 		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
@@ -74,23 +106,49 @@ jQuery.offset = {
 		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
 
 		body.removeChild( container );
+		body = container = innerDiv = checkDiv = table = td = null;
 		jQuery.offset.initialize = function(){};
 	},
 
-	bodyOffset: function(body) {
-		jQuery.offset.initialize();
+	bodyOffset: function( body ) {
 		var top = body.offsetTop, left = body.offsetLeft;
-		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset )
-			top  += parseFloat( jQuery.curCSS(body, 'marginTop',  true) ) || 0,
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.curCSS(body, 'marginTop',  true) ) || 0;
 			left += parseFloat( jQuery.curCSS(body, 'marginLeft', true) ) || 0;
+		}
+
 		return { top: top, left: left };
+	},
+	
+	setOffset: function( elem, options ) {
+		// set position first, in-case top/left are set even on static elem
+		if ( /static/.test( jQuery.curCSS( elem, 'position' ) ) ) {
+			elem.style.position = 'relative';
+		}
+		var curElem   = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curTop    = parseInt( jQuery.curCSS( elem, 'top',  true ), 10 ) || 0,
+			curLeft   = parseInt( jQuery.curCSS( elem, 'left', true ), 10)  || 0,
+			props     = {
+				top:  (options.top  - curOffset.top)  + curTop,
+				left: (options.left - curOffset.left) + curLeft
+			};
+		
+		if ( 'using' in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
 	}
 };
 
 
 jQuery.fn.extend({
 	position: function() {
-		if ( !this[0] ) return null;
+		if ( !this[0] ) { return null; }
 
 		var elem = this[0],
 
@@ -99,7 +157,7 @@ jQuery.fn.extend({
 
 		// Get correct offsets
 		offset       = this.offset(),
-		parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
+		parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
 
 		// Subtract element margins
 		// note: when an element has margin: auto the offsetLeft and marginLeft
@@ -119,10 +177,13 @@ jQuery.fn.extend({
 	},
 
 	offsetParent: function() {
-		var offsetParent = this[0].offsetParent || document.body;
-		while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') === 'static') )
-			offsetParent = offsetParent.offsetParent;
-		return jQuery( offsetParent );
+		return this.map(function(){
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, 'position') === 'static') ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
 	}
 });
 
@@ -132,33 +193,38 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
 	var method = 'scroll' + name;
 
 	jQuery.fn[ method ] = function(val) {
-		if ( !this[0] ) return null;
+		var elem = this[0], win;
 		
-		var elem = this[0], win = ("scrollTo" in elem && elem.document) ? elem :
-			(elem.nodeName === "#document") ? elem.defaultView || elem.parentWindow :
-				false;
-
-		return val !== undefined ?
+		if ( !elem ) { return null; }
 
+		if ( val !== undefined ) {
 			// Set the scroll offset
-			this.each(function() {
-				win = ("scrollTo" in this && this.document) ? this : 
-					(this.nodeName === "#document") ? this.defaultView || this.parentWindow :
-						false;
-				
+			return this.each(function() {
+				win = getWindow( this );
+
 				win ?
 					win.scrollTo(
 						!i ? val : jQuery(win).scrollLeft(),
 						 i ? val : jQuery(win).scrollTop()
 					) :
 					this[ method ] = val;
-			}) :
+			});
+		} else {
+			win = getWindow( elem );
 
 			// Return the scroll offset
-			win ?
-				win[ i ? 'pageYOffset' : 'pageXOffset' ] ||
-					jQuery.support.boxModel && win.document.documentElement[ method ] ||
+			return win ? ('pageXOffset' in win) ? win[ i ? 'pageYOffset' : 'pageXOffset' ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
 					win.document.body[ method ] :
 				elem[ method ];
+		}
 	};
 });
+
+function getWindow( elem ) {
+	return ("scrollTo" in elem && elem.document) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}