X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Foffset.js;h=010c57d1954e679995a77f8443178fe1ec5fe585;hb=5d033dba02fc1ffe1398cdaf0e9d402fc75e13f0;hp=11a187eedee51391cebb9c7f6862519439184045;hpb=d7f5a0835bc463d15a4f6210e48110054a050f0b;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 11a187e..010c57d 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -9,7 +9,7 @@ jQuery.fn.offset = function() {
 		    offsetChild  = elem,
 		    offsetParent = elem.offsetParent, 
 		    doc          = elem.ownerDocument,
-		    safari2      = safari && parseInt(version) < 522,
+		    safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
 		    fixed        = jQuery.css(elem, "position") == "fixed";
 	
 		// Use getBoundingClientRect if available
@@ -55,7 +55,7 @@ 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")) )
 					// Subtract parent scroll offsets
@@ -86,7 +86,7 @@ jQuery.fn.offset = function() {
 	}
 
 	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) {
@@ -96,3 +96,32 @@ jQuery.fn.offset = function() {
 
 	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