X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdimensions.js;h=44ba3571366c83178832a6098a99bcf6e121d181;hb=f717260eead8a272f6c582cef43c3dcb4fb73b42;hp=42e3f1d638890f74f5559cbf0dce2c20be8cd54f;hpb=44a6f5d0cb7f1124cd80e9b72d1fff9a46fe4c0b;p=jquery.git

diff --git a/src/dimensions.js b/src/dimensions.js
index 42e3f1d..44ba357 100644
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -1,8 +1,8 @@
 // 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
+	var tl = i ? "Left"  : "Top",  // top or left
+		br = i ? "Right" : "Bottom"; // bottom or right
 
 	// innerHeight and innerWidth
 	jQuery.fn["inner" + name] = function(){
@@ -16,13 +16,12 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 		return this["inner" + name]() +
 			num(this, "border" + tl + "Width") +
 			num(this, "border" + br + "Width") +
-			(!!margin ?
+			(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), 10 ) || 0;
+	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
 }