X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=7343353b5d8b01e3757a68d28bf7fa9055882197;hb=70b9aed422c34047299fe6e8934902fae61f2a3e;hp=c27dc5a8dcbce3c7bf2bca2e8e89b845566a7109;hpb=3d8ceaf2f21f4782ff21746887e2bcf56025e704;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index c27dc5a..7343353 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -1,7 +1,12 @@
 if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function() {
+	jQuery.fn.offset = function( options ) {
 		var elem = this[0];
 		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 );
 		}
@@ -13,9 +18,14 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 		return { top: top, left: left };
 	};
 } else {
-	jQuery.fn.offset = function() {
+	jQuery.fn.offset = function( options ) {
 		var elem = this[0];
 		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 );
 		}
@@ -25,18 +35,18 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 		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; }
 
 			computedStyle = defaultView.getComputedStyle(elem, null);
-			top -= elem.scrollTop;
+			top  -= elem.scrollTop;
 			left -= elem.scrollLeft;
 
 			if ( elem === offsetParent ) {
-				top += elem.offsetTop;
+				top  += elem.offsetTop;
 				left += elem.offsetLeft;
 
 				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
@@ -96,12 +106,11 @@ jQuery.offset = {
 		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
 
 		body.removeChild( container );
-		jQuery.offset.initialize = function(){};
-		
 		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = function(){};
 	},
 
-	bodyOffset: function(body) {
+	bodyOffset: function( body ) {
 		var top = body.offsetTop, left = body.offsetLeft;
 
 		jQuery.offset.initialize();
@@ -112,6 +121,27 @@ jQuery.offset = {
 		}
 
 		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 );
+		}
 	}
 };