X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=8268ce726b55175c7a3d6b6f13fa66481674385a;hb=ebad701751689b773afe29d1e3c4532c7810d02a;hp=3f616baa1e9192c48499c4c13b726ef1c38a0da5;hpb=48e9a3999596c2ee1f4470a78637de8f27e3b219;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 3f616ba..8268ce7 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 ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
 			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;
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			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 );
+		}
 	}
 };
 
@@ -163,40 +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;
+		
+		if ( !elem ) { return null; }
 
 		if ( val !== undefined ) {
 			// Set the scroll offset
 			return this.each(function() {
 				win = getWindow( this );
 
-				if ( win ) {
+				win ?
 					win.scrollTo(
 						!i ? val : jQuery(win).scrollLeft(),
 						 i ? val : jQuery(win).scrollTop()
-					);
-				} else {
+					) :
 					this[ method ] = val;
-				}
 			});
 		} else {
-			var elem = this[0],
-				win  = getWindow( elem );
+			win = getWindow( elem );
 
 			// Return the scroll offset
-			return win && 'pageXOffset' in 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;
-	}
 });
+
+function getWindow( elem ) {
+	return ("scrollTo" in elem && elem.document) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}