X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Foffset.js;h=045a580c218896cc2a89f7360774c8c4e61d3009;hb=9de35ce3e73c63c791472ac773afa141a8c4ae7b;hp=257035816169df4face0b3c50a289b900850806d;hpb=58c640fb1ce09a03399a3a441716cca23f3f2d04;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 2570358..045a580 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -9,8 +9,9 @@ jQuery.fn.offset = function() {
 		    offsetChild  = elem,
 		    offsetParent = elem.offsetParent, 
 		    doc          = elem.ownerDocument,
-		    safari2      = safari && parseInt(version) < 522,
-		    fixed        = jQuery.css(elem, "position") == "fixed";
+		    safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
+		    css          = jQuery.curCSS,
+		    fixed        = css(elem, "position") == "fixed";
 	
 		// Use getBoundingClientRect if available
 		if ( elem.getBoundingClientRect ) {
@@ -45,7 +46,7 @@ jQuery.fn.offset = function() {
 					border( offsetParent );
 					
 				// Add the document scroll offsets if position is fixed on any offsetParent
-				if ( !fixed && jQuery.css(offsetParent, "position") == "fixed" )
+				if ( !fixed && css(offsetParent, "position") == "fixed" )
 					fixed = true;
 			
 				// Set offsetChild to previous offsetParent unless it is the body element
@@ -55,14 +56,14 @@ jQuery.fn.offset = function() {
 			}
 		
 			// Get parent scroll offsets
-			while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
+			while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
 				// Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
-				if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) )
+				if ( !/^inline|table.*$/i.test(css(parent, "display")) )
 					// Subtract parent scroll offsets
 					add( -parent.scrollLeft, -parent.scrollTop );
 			
 				// Mozilla does not add the border for a parent that has overflow != visible
-				if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
+				if ( mozilla && css(parent, "overflow") != "visible" )
 					border( parent );
 			
 				// Get next parent
@@ -71,8 +72,8 @@ jQuery.fn.offset = function() {
 		
 			// Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
 			// Mozilla doubles body offsets with a non-absolutely positioned offsetChild
-			if ( (safari2 && (fixed || jQuery.css(offsetChild, "position") == "absolute")) || 
-				(mozilla && jQuery.css(offsetChild, "position") != "absoltue") )
+			if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) || 
+				(mozilla && css(offsetChild, "position") != "absolute") )
 					add( -doc.body.offsetLeft, -doc.body.offsetTop );
 			
 			// Add the document scroll offsets if position is fixed
@@ -85,14 +86,43 @@ jQuery.fn.offset = function() {
 		results = { top: top, left: left };
 	}
 
-	return results;
-
 	function border(elem) {
-		add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+		add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
 	}
 
 	function add(l, t) {
 		left += parseInt(l) || 0;
 		top += parseInt(t) || 0;
 	}
+
+	return results;
 };
+
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each(["Height", "Width"], function(i, name){
+
+	var tl = name == "Height" ? "Top"    : "Left",  // top or left
+		br = name == "Height" ? "Bottom" : "Right"; // bottom or right
+	
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function(){
+		return this[ name.toLowerCase() ]() + 
+			num(this, "padding" + tl) + 
+			num(this, "padding" + br);
+	};
+	
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function(margin) {
+		return this["inner" + name]() + 
+			num(this, "border" + tl + "Width") +
+			num(this, "border" + br + "Width") +
+			(!!margin ? 
+				num(this, "margin" + tl) + num(this, "margin" + br) : 0);
+	};
+	
+});
+
+function num(elem, prop) {
+	elem = elem.jquery ? elem[0] : elem;
+	return elem && parseInt( jQuery.curCSS(elem, prop, true) ) || 0;
+}
\ No newline at end of file