X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=f64835a08a2b8a143b23119131f11206fd7ce911;hb=45a3c06e8fd4ac04f5d914ecf5d2e25148160b3b;hp=d40335b8b79a8ff880e8492a485e36cc396a0110;hpb=6ceecc520a2b521dedce47f83c954727299b6653;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index d40335b..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); + } } } @@ -1266,7 +1269,9 @@ jQuery.extend({ "class": "className", "float": "cssFloat", innerHTML: "innerHTML", - className: "className" + className: "className", + value: "value", + disabled: "disabled" }; if ( fix[name] ) {