X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=f64835a08a2b8a143b23119131f11206fd7ce911;hb=45a3c06e8fd4ac04f5d914ecf5d2e25148160b3b;hp=c8605d9854e3c87ff79212dc1a6fce983ec2a34e;hpb=a4ec609b6a52a3c0f791d5426c1a5816b23e6956;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index c8605d9..f64835a 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -378,8 +378,9 @@ jQuery.fn = jQuery.prototype = {
 		for ( var j = 0; j < e.length; j++ ) {
 			var r = e[j].childNodes;
 			for ( var i = 0; i < r.length; i++ )
-				t += r[i].nodeType != 1 ?
-					r[i].nodeValue : jQuery.fn.text([ r[i] ]);
+				if ( r[i].nodeType != 8 )
+					t += r[i].nodeType != 1 ?
+						r[i].nodeValue : jQuery.fn.text([ r[i] ]);
 		}
 		return t;
 	},
@@ -1198,6 +1199,8 @@ jQuery.extend({
 			var foundToken = false;
 			
 			for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+				if ( foundToken ) continue;
+
 				var re = new RegExp("^(" + jQuery.token[i] + ")");
 				var m = re.exec(t);
 				
@@ -1234,12 +1237,12 @@ jQuery.extend({
 							);
 					}
 				}
-			}
 	
-			if ( t ) {
-				var val = jQuery.filter(t,r);
-				ret = r = val.r;
-				t = jQuery.trim(val.t);
+				if ( t ) {
+					var val = jQuery.filter(t,r);
+					ret = r = val.r;
+					t = jQuery.trim(val.t);
+				}
 			}
 		}
 	
@@ -1267,7 +1270,8 @@ jQuery.extend({
 			"float": "cssFloat",
 			innerHTML: "innerHTML",
 			className: "className",
-			value: "value"
+			value: "value",
+			disabled: "disabled"
 		};
 
 		if ( fix[name] ) {