X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fjquery%2Fjquery.js;h=08f325c34a8c1af2d1c0bb77b495587090cfca2a;hb=23e255015fb5e4f5ce7e8dd091b1550e80cccdd9;hp=e3929f0de608bd3b11adcc2177b8fc7b6ceefa51;hpb=ccf9d4406296fed48aae0989f2303287f133ed9e;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index e3929f0..08f325c 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -937,7 +937,7 @@ jQuery.extend({
 					oHeight = e.offsetHeight;
 					oWidth = e.offsetWidth;
 				} else
-					jQuery.swap( e, { visibility: "hidden", position: "absolute", display: "" },
+					jQuery.swap( e, { visibility: "hidden", position: "absolute", display: "block" },
 						function(){
 							oHeight = e.clientHeight;
 							oWidth = e.clientWidth;
@@ -957,8 +957,8 @@ jQuery.extend({
 		if (!force && e.style[p])
 			r = e.style[p];
 		else if (e.currentStyle) {
-			p = p.replace(/\-(\w)/g,function(m,c){return c.toUpperCase()}); 
-			r = e.currentStyle[p];
+			var np = p.replace(/\-(\w)/g,function(m,c){return c.toUpperCase()}); 
+			r = e.currentStyle[p] || e.currentStyle[np];
 		} else if (document.defaultView && document.defaultView.getComputedStyle) {
 			p = p.replace(/([A-Z])/g,"-$1").toLowerCase();
 			var s = document.defaultView.getComputedStyle(e,"");
@@ -1405,7 +1405,7 @@ jQuery.extend({
 
 		return jQuery.extend( elems, {
 			last: elems.n == elems.length - 1,
-			cur: n == "even" && elems.n % 2 == 0 || n == "odd" && elems.n % 2 || elems[pos] == a,
+			cur: pos == "even" && elems.n % 2 == 0 || pos == "odd" && elems.n % 2 || elems[pos] == elem,
 			prev: elems[elems.n - 1],
 			next: elems[elems.n + 1]
 		});
@@ -1426,7 +1426,7 @@ jQuery.extend({
 		// Move b over to the new array (this helps to avoid
 		// StaticNodeList instances)
 		for ( var k = 0; k < first.length; k++ )
-			result[k] = second[k];
+			result[k] = first[k];
 	
 		// Now check for duplicates between a and b and only
 		// add the unique items